better fix with one loop

Author: jhheider

crates/lib/src/env.rs

@@ -120,19 +120,12 @@ fn suffixes(key: &EnvKey) -> Option<Vec<&'static str>> {
 }
 
 pub fn mix(input: HashMap<String, Vec<String>>) -> HashMap<String, String> {
-    let mut rv = HashMap::new();
+    let mut rv = HashMap::from_iter(std::env::vars());
 
-    // append the existing keys
-    for (key, mut value) in std::env::vars() {
-        if let Some(injected_values) = input.get(&key) {
-            value = format!("{}:{}", injected_values.join(":"), value);
-        }
-        rv.insert(key, value);
-    }
-
-    // add the new keys
     for (key, value) in input.iter() {
-        if !rv.contains_key(key) {
+        if let Some(values) = rv.get(key) {
+            rv.insert(key.clone(), format!("{}:{}", value.join(":"), values));
+        } else {
             rv.insert(key.clone(), value.join(":"));
         }
     }