Fix clippy warnings on Windows (#1088)

Author: ChrisDenton

dev-tools/cc-test/build.rs

@@ -169,7 +169,7 @@ fn main() {
 #[track_caller]
 fn run_forked_capture_output(out: &Path, action: &str) {
     let program = env::current_exe().unwrap();
-    let output = Command::new(&program).arg(action).output().unwrap();
+    let output = Command::new(program).arg(action).output().unwrap();
     assert!(output.status.success(), "output: {:#?}", output);
     // we've captured the output and now we write it to a dedicated directory in the
     // build output so our tests can access the output.

dev-tools/gen-target-info/src/main.rs

@@ -12,7 +12,7 @@ fn generate_riscv_arch_mapping(f: &mut File, target_specs: &RustcTargetSpecs) {
         .iter()
         .filter_map(|(target, target_spec)| {
             let arch = target.split_once('-').unwrap().0;
-            (arch.contains("riscv") && arch != &target_spec.arch)
+            (arch.contains("riscv") && arch != target_spec.arch)
                 .then_some((arch, &*target_spec.arch))
         })
         .collect::<Vec<_>>();

src/command_helpers.rs

@@ -398,7 +398,7 @@ pub(crate) struct CmdAddOutputFileArgs {
 
 pub(crate) fn command_add_output_file(cmd: &mut Command, dst: &Path, args: CmdAddOutputFileArgs) {
     if args.is_assembler_msvc
-        || (args.msvc && !args.clang && !args.gnu && !args.cuda && !(args.is_asm && args.is_arm))
+        || !(!args.msvc || args.clang || args.gnu || args.cuda || (args.is_asm && args.is_arm))
     {
         let mut s = OsString::from("-Fo");
         s.push(dst);

src/lib.rs

@@ -186,7 +186,7 @@ mod inherited_jobserver {
                         // Fallback to creating a help thread with blocking acquire
                         let helper_thread = self
                             .helper_thread
-                            .get_or_try_init(|| HelperThread::new(&self.jobserver))?;
+                            .get_or_try_init(|| HelperThread::new(self.jobserver))?;
 
                         match helper_thread.rx.try_recv() {
                             Ok(res) => {

src/parallel/job_token.rs

@@ -96,7 +96,7 @@ impl Tool {
     ) -> Self {
         fn is_zig_cc(path: &Path, cargo_output: &CargoOutput) -> bool {
             run_output(
-                Command::new(&path).arg("--version"),
+                Command::new(path).arg("--version"),
                 path,
                 // tool detection issues should always be shown as warnings
                 cargo_output,
@@ -392,10 +392,7 @@ impl Tool {
 
     /// Whether the tool is MSVC-like.
     pub fn is_like_msvc(&self) -> bool {
-        match self.family {
-            ToolFamily::Msvc { .. } => true,
-            _ => false,
-        }
+        matches!(self.family, ToolFamily::Msvc { .. })
     }
 }
 

src/tool.rs

@@ -142,14 +142,13 @@ pub fn find_vs_version() -> Result<VsVers, String> {
             } else if impl_::has_msbuild_version("12.0") {
                 Ok(VsVers::Vs12)
             } else {
-                Err(format!(
-                    "\n\n\
+                Err("\n\n\
                      couldn't determine visual studio generator\n\
                      if VisualStudio is installed, however, consider \
                      running the appropriate vcvars script before building \
                      this crate\n\
                      "
-                ))
+                .to_string())
             }
         }
     }
@@ -296,10 +295,8 @@ mod impl_ {
     /// Attempt to find the tool using environment variables set by vcvars.
     pub(super) fn find_msvc_environment(tool: &str, target: TargetArch<'_>) -> Option<Tool> {
         // Early return if the environment doesn't contain a VC install.
-        if env::var_os("VCINSTALLDIR").is_none() {
-            return None;
-        }
-        let vs_install_dir = env::var_os("VSINSTALLDIR")?.into();
+        env::var_os("VCINSTALLDIR")?;
+        let vs_install_dir: PathBuf = env::var_os("VSINSTALLDIR")?.into();
 
         // If the vscmd target differs from the requested target then
         // attempt to get the tool using the VS install directory.
@@ -334,9 +331,9 @@ mod impl_ {
         };
         Box::new(instances.into_iter().filter_map(move |instance| {
             let installation_name = instance.installation_name()?;
-            if installation_name.starts_with(&format!("VisualStudio/{}.", version)) {
-                Some(instance.installation_path()?)
-            } else if installation_name.starts_with(&format!("VisualStudioPreview/{}.", version)) {
+            if installation_name.starts_with(&format!("VisualStudio/{}.", version))
+                || installation_name.starts_with(&format!("VisualStudioPreview/{}.", version))
+            {
                 Some(instance.installation_path()?)
             } else {
                 None
@@ -417,7 +414,7 @@ mod impl_ {
         };
 
         let vswhere_output = Command::new(vswhere_path)
-            .args(&[
+            .args([
                 "-latest",
                 "-products",
                 "*",
@@ -500,7 +497,7 @@ mod impl_ {
     fn tool_from_vs15plus_instance(
         tool: &str,
         target: TargetArch<'_>,
-        instance_path: &PathBuf,
+        instance_path: &Path,
     ) -> Option<Tool> {
         let (root_path, bin_path, host_dylib_path, lib_path, alt_lib_path, include_path) =
             vs15plus_vc_paths(target, instance_path)?;
@@ -706,7 +703,7 @@ mod impl_ {
     }
 
     fn add_env(tool: &mut Tool, env: &str, paths: Vec<PathBuf>) {
-        let prev = env::var_os(env).unwrap_or(OsString::new());
+        let prev = env::var_os(env).unwrap_or_default();
         let prev = env::split_paths(&prev);
         let new = paths.into_iter().chain(prev);
         tool.env
@@ -809,8 +806,7 @@ mod impl_ {
         let dir = dirs
             .into_iter()
             .rev()
-            .filter(|dir| dir.join("um").join("x64").join("kernel32.lib").is_file())
-            .next()?;
+            .find(|dir| dir.join("um").join("x64").join("kernel32.lib").is_file())?;
         let version = dir.components().last().unwrap();
         let version = version.as_os_str().to_str().unwrap().to_string();
         Some((root.into(), version))
@@ -922,7 +918,7 @@ mod impl_ {
         for subkey in key.iter().filter_map(|k| k.ok()) {
             let val = subkey
                 .to_str()
-                .and_then(|s| s.trim_start_matches("v").replace('.', "").parse().ok());
+                .and_then(|s| s.trim_start_matches('v').replace('.', "").parse().ok());
             let val = match val {
                 Some(s) => s,
                 None => continue,

src/windows/find_tools.rs

@@ -73,7 +73,7 @@ impl TryFrom<&Vec<u8>> for VswhereInstance {
     fn try_from(output: &Vec<u8>) -> Result<Self, Self::Error> {
         let map: HashMap<_, _> = output
             .lines()
-            .filter_map(Result::ok)
+            .map_while(Result::ok)
             .filter_map(|s| {
                 let mut splitn = s.splitn(2, ": ");
                 Some((splitn.next()?.to_owned(), splitn.next()?.to_owned()))

src/windows/vs_instances.rs

@@ -55,22 +55,16 @@ fn ccache_env_flags() {
         compiler.cc_env(),
         OsString::from("ccache lol-this-is-not-a-compiler")
     );
-    assert!(
-        compiler
-            .cflags_env()
-            .into_string()
-            .unwrap()
-            .contains("ccache")
-            == false
-    );
-    assert!(
-        compiler
-            .cflags_env()
-            .into_string()
-            .unwrap()
-            .contains(" lol-this-is-not-a-compiler")
-            == false
-    );
+    assert!(!compiler
+        .cflags_env()
+        .into_string()
+        .unwrap()
+        .contains("ccache"));
+    assert!(!compiler
+        .cflags_env()
+        .into_string()
+        .unwrap()
+        .contains(" lol-this-is-not-a-compiler"));
 
     env::set_var("CC", "");
 }

tests/cc_env.rs

@@ -7,7 +7,6 @@ use std::io;
 use std::io::prelude::*;
 use std::path::{Path, PathBuf};
 
-use cc;
 use tempfile::{Builder, TempDir};
 
 pub struct Test {
@@ -86,12 +85,10 @@ impl Test {
         let mut cfg = cc::Build::new();
         let target = if self.msvc {
             "x86_64-pc-windows-msvc"
+        } else if cfg!(target_os = "macos") {
+            "x86_64-apple-darwin"
         } else {
-            if cfg!(target_os = "macos") {
-                "x86_64-apple-darwin"
-            } else {
-                "x86_64-unknown-linux-gnu"
-            }
+            "x86_64-unknown-linux-gnu"
         };
 
         cfg.target(target)