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`.
8573 · Mar 19, 2018 · 3bcb5e4 · 3bcb5e4
1 parent f071f08
commit 3bcb5e4
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/rustfmt.toml b/rustfmt.toml
diff --git a/shell.nix b/shell.nix
@@ -20,11 +20,10 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     (rustChannelOf {
-      channel = "1.22.1";
+      channel = "1.24.1";
     }).rust
     clang
     git
-    rustfmt
     pkgconfig
   ];