about summary refs log tree commit diff
path: root/src/librustc_target
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2020-03-21 12:50:22 +0100
committerMatthias Krüger <matthias.krueger@famsik.de>2020-03-21 15:24:48 +0100
commit54e103b2f9d0141ce751df3e99b3a7bc4337181b (patch)
treee2ac24e37cffc98ba10c10ac702acbd9806a3d6d /src/librustc_target
parent98803c182b2ba6ef5dccb6bf501958249295eac0 (diff)
downloadrust-54e103b2f9d0141ce751df3e99b3a7bc4337181b.tar.gz
rust-54e103b2f9d0141ce751df3e99b3a7bc4337181b.zip
don't convert results to options just for matching (clippy::if_let_some_result)
Diffstat (limited to 'src/librustc_target')
-rw-r--r--src/librustc_target/spec/apple_base.rs2
-rw-r--r--src/librustc_target/spec/apple_sdk_base.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_target/spec/apple_base.rs b/src/librustc_target/spec/apple_base.rs
index d116ddf952a..4ad65569e6a 100644
--- a/src/librustc_target/spec/apple_base.rs
+++ b/src/librustc_target/spec/apple_base.rs
@@ -57,7 +57,7 @@ pub fn macos_link_env_remove() -> Vec<String> {
     let mut env_remove = Vec::with_capacity(2);
     // Remove the `SDKROOT` environment variable if it's clearly set for the wrong platform, which
     // may occur when we're linking a custom build script while targeting iOS for example.
-    if let Some(sdkroot) = env::var("SDKROOT").ok() {
+    if let Ok(sdkroot) = env::var("SDKROOT") {
         if sdkroot.contains("iPhoneOS.platform") || sdkroot.contains("iPhoneSimulator.platform") {
             env_remove.push("SDKROOT".to_string())
         }
diff --git a/src/librustc_target/spec/apple_sdk_base.rs b/src/librustc_target/spec/apple_sdk_base.rs
index 513754352fb..03e0c55282e 100644
--- a/src/librustc_target/spec/apple_sdk_base.rs
+++ b/src/librustc_target/spec/apple_sdk_base.rs
@@ -43,7 +43,7 @@ pub fn get_sdk_root(sdk_name: &str) -> Result<String, String> {
     // to allow the SDK path to be set. (For clang, xcrun sets
     // SDKROOT; for rustc, the user or build system can set it, or we
     // can fall back to checking for xcrun on PATH.)
-    if let Some(sdkroot) = env::var("SDKROOT").ok() {
+    if let Ok(sdkroot) = env::var("SDKROOT") {
         let p = Path::new(&sdkroot);
         match sdk_name {
             // Ignore `SDKROOT` if it's clearly set for the wrong platform.