Auto merge of #1769 - RalfJung:remove-compat, r=oli-obk

[rust.git] / cargo-miri / bin.rs

diff --git a/cargo-miri/bin.rs b/cargo-miri/bin.rs
index 01b445ee7eb4c85f1a4e69cf389fc0c9560ab10f..e29bdc7717191cef6505afd98808ca114713d1d3 100644 (file)
--- a/cargo-miri/bin.rs
+++ b/cargo-miri/bin.rs
@@ -506,46 +506,8 @@ fn phase_cargo_miri(mut args: env::Args) {
         &host
     };
 
-    // Forward all further arguments. We do some processing here because we want to
-    // detect people still using the old way of passing flags to Miri
-    // (`cargo miri -- -Zmiri-foo`).
-    while let Some(arg) = args.next() {
-        cmd.arg(&arg);
-        if arg == "--" {
-            // Check if the next argument starts with `-Zmiri`. If yes, we assume
-            // this is an old-style invocation.
-            if let Some(next_arg) = args.next() {
-                if next_arg.starts_with("-Zmiri") || next_arg == "--" {
-                    eprintln!(
-                        "WARNING: it seems like you are setting Miri's flags in `cargo miri` the old way,\n\
-                        i.e., by passing them after the first `--`. This style is deprecated; please set\n\
-                        the MIRIFLAGS environment variable instead. `cargo miri run/test` now interprets\n\
-                        arguments the exact same way as `cargo run/test`."
-                    );
-                    // Old-style invocation. Turn these into MIRIFLAGS, if there are any.
-                    if next_arg != "--" {
-                        let mut miriflags = env::var("MIRIFLAGS").unwrap_or_default();
-                        miriflags.push(' ');
-                        miriflags.push_str(&next_arg);
-                        while let Some(further_arg) = args.next() {
-                            if further_arg == "--" {
-                                // End of the Miri flags!
-                                break;
-                            }
-                            miriflags.push(' ');
-                            miriflags.push_str(&further_arg);
-                        }
-                        env::set_var("MIRIFLAGS", miriflags);
-                    }
-                    // Pass the remaining flags to cargo.
-                    cmd.args(args);
-                    break;
-                }
-                // Not a Miri argument after all, make sure we pass it to cargo.
-                cmd.arg(next_arg);
-            }
-        }
-    }
+    // Forward all further arguments to cargo.
+    cmd.args(args);
 
     // Set `RUSTC_WRAPPER` to ourselves.  Cargo will prepend that binary to its usual invocation,
     // i.e., the first argument is `rustc` -- which is what we use in `main` to distinguish