miri subtree update

src/tools/miri/Cargo.toml

@@ -1,5 +1,4 @@
 [package]
-authors = ["Miri Team"]
 description = "An experimental interpreter for Rust MIR (core driver)."
 license = "MIT OR Apache-2.0"
 name = "miri"

src/tools/miri/bench-cargo-miri/mse/Cargo.toml

@@ -1,7 +1,6 @@
 [package]
 name = "mse"
 version = "0.1.0"
-authors = ["Ralf Jung <post@ralfj.de>"]
 edition = "2018"
 
 [dependencies]

src/tools/miri/bench-cargo-miri/serde1/Cargo.toml

@@ -1,7 +1,6 @@
 [package]
 name = "cargo-miri-test"
 version = "0.1.0"
-authors = ["Oliver Schneider <git-spam-no-reply9815368754983@oli-obk.de>"]
 edition = "2018"
 
 [dependencies]

src/tools/miri/bench-cargo-miri/serde2/Cargo.toml

@@ -1,7 +1,6 @@
 [package]
 name = "cargo-miri-test"
 version = "0.1.0"
-authors = ["Oliver Schneider <git-spam-no-reply9815368754983@oli-obk.de>"]
 edition = "2018"
 
 [dependencies]

src/tools/miri/cargo-miri/Cargo.toml

@@ -1,5 +1,4 @@
 [package]
-authors = ["Miri Team"]
 description = "An experimental interpreter for Rust MIR (cargo wrapper)."
 license = "MIT OR Apache-2.0"
 name = "cargo-miri"

src/tools/miri/genmc-sys/Cargo.toml

@@ -1,5 +1,4 @@
 [package]
-authors = ["Miri Team"]
 license = "MIT OR Apache-2.0"
 name = "genmc-sys"
 version = "0.1.0"

src/tools/miri/miri-script/Cargo.toml

@@ -1,5 +1,4 @@
 [package]
-authors = ["Miri Team"]
 description = "Helpers for miri maintenance"
 license = "MIT OR Apache-2.0"
 name = "miri-script"

src/tools/miri/miri-script/src/util.rs

@@ -157,7 +157,11 @@ impl MiriEnv {
         let features = features_to_args(features);
         // Install binaries to the miri toolchain's `sysroot` so they do not interact with other toolchains.
         // (Not using `cargo_cmd` as `install` is special and doesn't use `--manifest-path`.)
-        cmd!(self.sh, "{cargo_bin} +{toolchain} install {cargo_extra_flags...} --path {path} --force --root {sysroot} {features...} {args...}").run()?;
+        // Adding `--locked` so that behavior is closer to `./miri build`. However, cargo doesn't
+        // like `--locked --locked` so we need extra logic to avoid that.
+        let locked_flag =
+            if cargo_extra_flags.iter().any(|f| f == "--locked") { None } else { Some("--locked") };
+        cmd!(self.sh, "{cargo_bin} +{toolchain} install {locked_flag...} {cargo_extra_flags...} --path {path} --force --root {sysroot} {features...} {args...}").run()?;
         Ok(())
     }
 

src/tools/miri/rust-version

@@ -1 +1 @@
-44860d3e9ef700cac0b4a61d924f41f46bf1b447
+63b1dfc0e00fd6f8ad7cd8817fc712e7d9b7be59