Lint

Author: Nick Flueckiger

src/cargo/util/config/mod.rs

@@ -213,12 +213,14 @@ impl Config {
             })
             .collect();
 
-        let mut upper_case_env : HashMap<String, String> = HashMap::new();
+        let mut upper_case_env: HashMap<String, String> = HashMap::new();
 
         if !cfg!(windows) {
-            upper_case_env = env.clone().into_iter().map(|(k, _)| {
-                (k.to_uppercase().replace("-", "_"), k)
-            }).collect();
+            upper_case_env = env
+                .clone()
+                .into_iter()
+                .map(|(k, _)| (k.to_uppercase().replace("-", "_"), k))
+                .collect();
         }
 
         let cache_rustc_info = match env.get("CARGO_CACHE_RUSTC_INFO") {
@@ -539,7 +541,7 @@ impl Config {
             None => {
                 self.check_environment_key_case_mismatch(key);
                 Ok(None)
-            },
+            }
         }
     }
 
@@ -568,14 +570,15 @@ impl Config {
         if cfg!(windows) {
             return;
         }
-        match self.upper_case_env.get(key.as_env_key()){
+        match self.upper_case_env.get(key.as_env_key()) {
             Some(env_key) => {
-                let _ = self.shell().warn(
-                format!("Variables in environment require uppercase,
-                        but given variable: {}, contains lowercase or dash.", env_key)
-                );
-            },
-            None => {},
+                let _ = self.shell().warn(format!(
+                    "Variables in environment require uppercase,
+                        but given variable: {}, contains lowercase or dash.",
+                    env_key
+                ));
+            }
+            None => {}
         }
     }
 
@@ -673,8 +676,8 @@ impl Config {
             Some(v) => v,
             None => {
                 self.check_environment_key_case_mismatch(key);
-                return Ok(())
-            },
+                return Ok(());
+            }
         };
 
         let def = Definition::Environment(key.as_env_key().to_string());

tests/testsuite/tool_paths.rs

@@ -353,23 +353,25 @@ fn custom_linker_env() {
         .run();
 }
 
-
 #[cargo_test]
 #[cfg(not(windows))]
 fn target_in_environment_contains_lower_case() {
     let p = project().file("src/main.rs", "fn main() {}").build();
 
-    let target_keys = ["CARGO_TARGET_X86_64_UNKNOWN_LINUX_musl_LINKER",
-    "CARGO_TARGET_x86_64_unknown_linux_musl_LINKER"];
+    let target_keys = [
+        "CARGO_TARGET_X86_64_UNKNOWN_LINUX_musl_LINKER",
+        "CARGO_TARGET_x86_64_unknown_linux_musl_LINKER",
+    ];
 
     for target_key in &target_keys {
         p.cargo("build -v --target X86_64_unknown_linux_musl")
             .env(target_key, "nonexistent-linker")
             .with_status(101)
-            .with_stderr_contains(
-                format!("warning: Variables in environment require uppercase,
-                        but given variable: {}, contains lowercase or dash.", target_key)
-            )
+            .with_stderr_contains(format!(
+                "warning: Variables in environment require uppercase,
+                        but given variable: {}, contains lowercase or dash.",
+                target_key
+            ))
             .run();
     }
 }