mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

patch away --error-format and --json so that errors are rendered properly

Browse Source
This commit is contained in:
Ralf Jung 2020-09-09 09:12:26 +02:00
parent 119bf4d607
commit 74fdb5cf2c
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cargo-miri/bin.rs
View File

@ -588,16 +588,32 @@ fn phase_cargo_runner(binary: &str, binary_args: env::Args) {
}
let mut cmd = miri();
// Forward rustc arguments. We need to patch "--extern" filenames because
// we forced a check-only build without cargo knowing about that: replace `.rlib` suffix by `.rmeta`.
// Forward rustc arguments.
// We need to patch "--extern" filenames because we forced a check-only
// build without cargo knowing about that: replace `.rlib` suffix by
// `.rmeta`.
// We also need to remove `--error-format` as cargo specifies that to be JSON,
// but when we run here, cargo does not interpret the JSON any more. `--json`
// then also nees to be dropped.
let mut args = info.args.into_iter();
let extern_flag = "--extern";
let error_format_flag = "--error-format";
let json_flag = "--json";
while let Some(arg) = args.next() {
if arg == extern_flag {
// `--extern` is always passed as a separate argument by cargo.
let next_arg = args.next().expect("`--extern` should be followed by a filename");
let next_arg = next_arg.strip_suffix(".rlib").expect("all extern filenames should end in `.rlib`");
cmd.arg(extern_flag);
cmd.arg(format!("{}.rmeta", next_arg));
} else if arg.starts_with(error_format_flag) {
let suffix = &arg[error_format_flag.len()..];
assert!(suffix.starts_with('='));
// Drop this argument.
} else if arg.starts_with(json_flag) {
let suffix = &arg[json_flag.len()..];
assert!(suffix.starts_with('='));
// Drop this argument.
} else {
cmd.arg(arg);
}