Skip to content

Commit 3bcb5e4

Browse files
committed
Upgrade to Rust 1.24.1
Bump the Rust toolchain version specified in `shell.nix` from 1.22.1 to 1.24.1 to escape a `jobserver` bug: <rust-lang/rust#46981>. Version 1.24.1 comes with rustfmt, so this patch also drops the dependency on the Nix package for rustfmt. The version of rustfmt bundled with rustc 1.24.1 does not accept any of the `rustfmt.toml` configuration file options I was using, so this patch deletes `rustfmt.toml`.
1 parent f071f08 commit 3bcb5e4

File tree

2 files changed

+1
-8
lines changed

2 files changed

+1
-8
lines changed

rustfmt.toml

Lines changed: 0 additions & 6 deletions
This file was deleted.

shell.nix

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,10 @@ stdenv.mkDerivation rec {
2020

2121
nativeBuildInputs = [
2222
(rustChannelOf {
23-
channel = "1.22.1";
23+
channel = "1.24.1";
2424
}).rust
2525
clang
2626
git
27-
rustfmt
2827
pkgconfig
2928
];
3029

0 commit comments

Comments
 (0)