From d0256eca5f7b3db759ed0ca2a46226a1fc835f90 Mon Sep 17 00:00:00 2001 From: nomyfan Date: Tue, 20 Feb 2024 17:56:48 +0800 Subject: [PATCH 1/2] style: prefer immutable --- src/lib.rs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index b425404..52ac6cc 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -847,13 +847,10 @@ impl Library { } fn parse_libs_cflags(&mut self, name: &str, output: &[u8], config: &Config) { - let mut is_msvc = false; let target = env::var("TARGET"); - if let Ok(target) = &target { - if target.contains("msvc") { - is_msvc = true; - } - } + let is_msvc = target + .as_ref() + .map_or(false, |target| target.contains("msvc")); let system_roots = if cfg!(target_os = "macos") { vec![PathBuf::from("/Library"), PathBuf::from("/System")] From 7ceec77b783bdac9dedaef3225fde3f5da872e49 Mon Sep 17 00:00:00 2001 From: nomyfan Date: Tue, 20 Feb 2024 18:20:45 +0800 Subject: [PATCH 2/2] style: support 1.30.0 --- src/lib.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib.rs b/src/lib.rs index 52ac6cc..3b9a359 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -850,7 +850,8 @@ impl Library { let target = env::var("TARGET"); let is_msvc = target .as_ref() - .map_or(false, |target| target.contains("msvc")); + .map(|target| target.contains("msvc")) + .unwrap_or(false); let system_roots = if cfg!(target_os = "macos") { vec![PathBuf::from("/Library"), PathBuf::from("/System")]