user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #1556 - RalfJung:compat, r=RalfJung

Browse source 
also support old 'cargo miri run -- -- args' style

I forgot this in https://github.com/rust-lang/miri/pull/1540. Again this is just temporary, for backwards compatibility.
This commit is contained in:
bors 2020-09-21 07:11:37 +00:00
commit cbc7560ae2
1 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

26
cargo-miri/bin.rs
View file

@ -452,26 +452,28 @@ fn phase_cargo_miri(mut args: env::Args) {
// 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") {
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.
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;
}
// 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(&further_arg);
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);
}
env::set_var("MIRIFLAGS", miriflags);
// Pass the remaining flags to cargo.
cmd.args(args);
break;