Simplify debugging by printing all env vars, too

Author: oli-obk

cargo-miri/bin.rs

@@ -2,6 +2,7 @@
 
 mod version;
 
+use std::collections::HashMap;
 use std::env;
 use std::ffi::{OsStr, OsString};
 use std::fmt::Write as _;
@@ -882,7 +883,20 @@ fn phase_rustc(mut args: env::Args, phase: RustcPhase) {
 
     // Run it.
     if verbose {
-        eprintln!("[cargo-miri rustc] {:?}", cmd);
+        eprint!("[cargo-miri rustc] ");
+        let mut envs = HashMap::new();
+        for (key, value) in std::env::vars() {
+            envs.insert(key, value);
+        }
+        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());
+            }
+        }
+        for (key, value) in envs {
+            eprint!("{key}={value:?} ");
+        }
+        eprintln!("{:?}", cmd);
     }
     exec(cmd);