Address review

Author: mati865

src/librustc_codegen_ssa/back/link.rs

@@ -978,58 +978,59 @@ fn get_crt_libs_path(sess: &Session) -> Option<PathBuf> {
     where
         P: AsRef<Path>,
     {
-        env::var_os("PATH").and_then(|paths| {
-            env::split_paths(&paths)
-                .filter_map(|dir| {
-                    let full_path = dir.join(&exe_name);
-                    if full_path.is_file() {
-                        Some(fix_windows_verbatim_for_gcc(&full_path))
-                    } else {
-                        None
-                    }
-                })
-                .next()
-        })
+        for dir in env::split_paths(&env::var_os("PATH")?) {
+            let full_path = dir.join(&exe_name);
+            if full_path.is_file() {
+                return Some(fix_windows_verbatim_for_gcc(&full_path));
+            }
+        }
+        None
+    }
+
+    fn probe(sess: &Session) -> Option<PathBuf> {
+        if let (linker, LinkerFlavor::Gcc) = linker_and_flavor(&sess) {
+            let linker_path = if cfg!(windows) && !linker.extension().is_some() {
+                linker.with_extension("exe")
+            } else {
+                linker
+            };
+            if let Some(linker_path) = find_exe_in_path(linker_path) {
+                let mingw_arch = match &sess.target.target.arch {
+                    x if x == "x86" => "i686",
+                    x => x,
+                };
+                let mingw_dir = format!("{}-w64-mingw32", mingw_arch);
+                // Here we have path/bin/gcc but we need path/
+                let mut path = linker_path;
+                path.pop();
+                path.pop();
+                // Based on Clang MinGW driver
+                let probe_path = path.join(&mingw_dir).join("lib");
+                if probe_path.exists() {
+                    *SYSTEM_LIBS.lock().unwrap() = Some(Some(probe_path.clone()));
+                    return Some(probe_path);
+                };
+                let probe_path = path.join(&mingw_dir).join("sys-root/mingw/lib");
+                if probe_path.exists() {
+                    *SYSTEM_LIBS.lock().unwrap() = Some(Some(probe_path.clone()));
+                    return Some(probe_path);
+                };
+            };
+        };
+        *SYSTEM_LIBS.lock().unwrap() = Some(None);
+        None
     }
 
     use std::sync::Mutex;
     lazy_static::lazy_static! {
-        static ref SYSTEM_LIBS: Mutex<Option<Result<PathBuf, ()>>> = Mutex::new(None);
+        static ref SYSTEM_LIBS: Mutex<Option<Option<PathBuf>>> = Mutex::new(None);
     }
 
     let system_libs = SYSTEM_LIBS.lock().unwrap().clone();
     match system_libs {
-        Some(Ok(compiler_libs_path)) => Some(compiler_libs_path),
-        Some(Err(_)) => None,
-        _ => {
-            if let (linker, LinkerFlavor::Gcc) = linker_and_flavor(&sess) {
-                let linker_path = if cfg!(windows) { linker.with_extension("exe") } else { linker };
-                if let Some(linker_path) = find_exe_in_path(linker_path) {
-                    let mingw_arch = match &sess.target.target.arch {
-                        x if x == "x86" => "i686",
-                        x => x,
-                    };
-                    let mingw_dir = [mingw_arch, "-w64-mingw32"].concat();
-                    // Here we have path/bin/gcc but we need path/
-                    let mut path = linker_path;
-                    path.pop();
-                    path.pop();
-                    // Based on Clang MinGW driver
-                    let probe_path = path.join([&mingw_dir, "lib"].concat());
-                    if probe_path.exists() {
-                        *SYSTEM_LIBS.lock().unwrap() = Some(Ok(probe_path.clone()));
-                        return Some(probe_path);
-                    };
-                    let probe_path = path.join([&mingw_dir, "sys-root/mingw/lib"].concat());
-                    if probe_path.exists() {
-                        *SYSTEM_LIBS.lock().unwrap() = Some(Ok(probe_path.clone()));
-                        return Some(probe_path);
-                    };
-                };
-            };
-            *SYSTEM_LIBS.lock().unwrap() = Some(Err(()));
-            None
-        }
+        Some(Some(compiler_libs_path)) => Some(compiler_libs_path),
+        Some(None) => None,
+        None => probe(sess),
     }
 }