Actually remove environment variables if the command removes them

oli-obk · oli-obk · commit da00f7f6e192 · 2022-07-20T13:49:38.000Z
diff --git a/cargo-miri/bin.rs b/cargo-miri/bin.rs
@@ -900,6 +900,8 @@ fn phase_rustc(mut args: env::Args, phase: RustcPhase) {
         for (key, value) in cmd.get_envs() {
             if let Some(value) = value {
                 envs.insert(key.to_str().unwrap().into(), value.to_str().unwrap().to_owned());
+            } else {
+                envs.remove(key.to_str().unwrap());
             }
         }
         for (key, value) in envs {

Original file line number	Diff line number	Diff line change
`@@ -900,6 +900,8 @@ fn phase_rustc(mut args: env::Args, phase: RustcPhase) {`
`900`	`900`	`for (key, value) in cmd.get_envs() {`
`901`	`901`	`if let Some(value) = value {`
`902`	`902`	`envs.insert(key.to_str().unwrap().into(), value.to_str().unwrap().to_owned());`
	`903`	`+ } else {`
	`904`	`+ envs.remove(key.to_str().unwrap());`
`903`	`905`	`}`
`904`	`906`	`}`
`905`	`907`	`for (key, value) in envs {`