diff --git a/cargo-miri/bin.rs b/cargo-miri/bin.rs index f4f18929ba8..bb6d4b8789c 100644 --- a/cargo-miri/bin.rs +++ b/cargo-miri/bin.rs @@ -572,7 +572,7 @@ fn phase_cargo_miri(mut args: env::Args) { // us in order to skip them. cmd.env(&host_runner_env_name, &cargo_miri_path); - // Set rustdoc to us as well, so we can make it do nothing (see issue #584). + // Set rustdoc to us as well, so we can run doctests. cmd.env("RUSTDOC", &cargo_miri_path); // Run cargo. @@ -784,18 +784,6 @@ fn phase_cargo_rustc(mut args: env::Args) { } } -fn forward_patched_extern_arg(args: &mut impl Iterator, cmd: &mut Command) { - cmd.arg("--extern"); // always forward flag, but adjust filename: - let path = args.next().expect("`--extern` should be followed by a filename"); - if let Some(lib) = path.strip_suffix(".rlib") { - // If this is an rlib, make it an rmeta. - cmd.arg(format!("{}.rmeta", lib)); - } else { - // Some other extern file (e.g. a `.so`). Forward unchanged. - cmd.arg(path); - } -} - fn phase_cargo_runner(binary: &Path, binary_args: env::Args) { let verbose = std::env::var_os("MIRI_VERBOSE").is_some();