Apply changes from rust-lang#2908

Author: osiewicz

miri-script/Cargo.lock

@@ -17,3 +17,4 @@ which = "4.4"
 walkdir = "2.3"
 itertools = "0.10"
 path_macro = "1.0"
+shell-words = "1.1"

miri-script/Cargo.toml

@@ -6,6 +6,7 @@ use std::path::{Path, PathBuf};
 
 use duct::cmd;
 use path_macro::path;
+use shell_words;
 use walkdir::WalkDir;
 
 use crate::arg::Subcommands;
@@ -229,6 +230,12 @@ impl<'a> MiriRunner<'a> {
 impl MiriRunner<'_> {
     fn bench(&self, benches: &[String]) -> Result<()> {
         // Make sure we have an up-to-date Miri installed
+        let hyperfine = std::env::var("HYPERFINE");
+        let hyperfine = hyperfine.as_deref().unwrap_or("hyperfine -w 1 -m 5 --shell=none");
+        let hyperfine = shell_words::split(hyperfine).unwrap();
+        let Some((command, args)) = hyperfine.split_first() else {
+            todo!();
+        };
         let benches_dir = path!(self.miri_dir / "bench-cargo-miri");
         let benches = if benches.is_empty() {
             std::fs::read_dir(&benches_dir)?
@@ -245,9 +252,9 @@ impl MiriRunner<'_> {
             let current_bench_dir = path!(benches_dir / bench / "Cargo.toml");
             let current_bench_dir = current_bench_dir.to_string_lossy().into_owned();
             let toolchain = self.get_toolchain_override();
-            let command =
+            let bench_command =
                 format!("cargo {} miri run --manifest-path {current_bench_dir}", toolchain);
-            cmd("hyperfine", ["-w", "1", "-m", "5", "--shell=none", &command]).run()?;
+            cmd(command, chain!(args, [&bench_command])).run()?;
         }
         Ok(())
     }
@@ -450,7 +457,6 @@ impl MiriRunner<'_> {
                         "--path",
                         path,
                         "--force",
-                        "--locked",
                         "--root",
                         sysroot
                     ],