Auto merge of #990 - RalfJung:rustup2, r=RalfJung

hopefully harmless Rust bump

Just to make the rust version jump in #984 smaller.

rust-version

@@ -1 +1 @@
-2748a9fd93dd1a00a4521f4f16de5befbf77f6cd
+898f36c83cc28d7921a1d7b3605323dc5cfcf533

src/bin/cargo-miri.rs

@@ -136,8 +136,12 @@ fn test_sysroot_consistency() {
             .output().expect("Failed to run rustc to get sysroot info");
         let stdout = String::from_utf8(out.stdout).expect("stdout is not valid UTF-8");
         let stderr = String::from_utf8(out.stderr).expect("stderr is not valid UTF-8");
+        assert!(
+            out.status.success(),
+            "Bad status code {} when getting sysroot info via {:?}.\nstdout:\n{}\nstderr:\n{}",
+            out.status, cmd, stdout, stderr,
+        );
         let stdout = stdout.trim();
-        assert!(out.status.success(), "Bad status code when getting sysroot info.\nstdout:\n{}\nstderr:\n{}", stdout, stderr);
         PathBuf::from(stdout).canonicalize()
             .unwrap_or_else(|_| panic!("Failed to canonicalize sysroot: {}", stdout))
     }