Extract env var extraction out into a helper function

Author: oli-obk

cargo-miri/bin.rs

@@ -899,18 +899,7 @@ fn phase_rustc(mut args: env::Args, phase: RustcPhase) {
     if verbose > 0 {
         eprint!("[cargo-miri rustc] ");
         if verbose > 1 {
-            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());
-                } else {
-                    envs.remove(key.to_str().unwrap());
-                }
-            }
-            for (key, value) in envs {
+            for (key, value) in env_vars_from_cmd(&cmd) {
                 eprintln!("{key}={value:?} \\");
             }
         }
@@ -933,6 +922,23 @@ fn phase_rustc(mut args: env::Args, phase: RustcPhase) {
     }
 }
 
+fn env_vars_from_cmd(cmd: &Command) -> Vec<(String, String)> {
+    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());
+        } else {
+            envs.remove(key.to_str().unwrap());
+        }
+    }
+    let mut envs: Vec<_> = envs.into_iter().collect();
+    envs.sort();
+    envs
+}
+
 #[derive(Debug, Copy, Clone, PartialEq)]
 enum RunnerPhase {
     /// `cargo` is running a binary