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

avoid redundant setting of env vars in phase_runner

Browse Source
This commit is contained in:
Ralf Jung 2022-07-21 17:04:04 -04:00
parent 7c99f90271
commit fb428dfee3
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cargo-miri/bin.rs
View File

@ -1008,14 +1008,16 @@ fn phase_runner(mut binary_args: impl Iterator<Item = String>, phase: RunnerPhas
// Set missing env vars. We prefer build-time env vars over run-time ones; see
// <https://github.com/rust-lang/miri/issues/1661> for the kind of issue that fixes.
for (name, val) in info.env {
if verbose > 0 {
if let Some(old_val) = env::var_os(&name) {
if old_val != val {
eprintln!(
"[cargo-miri runner] Overwriting run-time env var {:?}={:?} with build-time value {:?}",
name, old_val, val
);
}
if let Some(old_val) = env::var_os(&name) {
if old_val == val {
// This one did not actually change, no need to re-set it.
// (This keeps the `debug_cmd` below more manageable.)
continue;
} else if verbose > 0 {
eprintln!(
"[cargo-miri runner] Overwriting run-time env var {:?}={:?} with build-time value {:?}",
name, old_val, val
);
}
}
cmd.env(name, val);