Move ExitStatus::success check into compile_probe()

build.rs

@@ -1,7 +1,7 @@
 use std::env;
 use std::ffi::OsString;
 use std::path::Path;
-use std::process::{self, Command, ExitStatus, Stdio};
+use std::process::{self, Command, Stdio};
 use std::str;
 
 #[cfg(all(feature = "backtrace", not(feature = "std")))]
@@ -15,13 +15,10 @@ fn main() {
         println!("cargo:rerun-if-changed=build/probe.rs");
         println!("cargo:rerun-if-env-changed=RUSTC_BOOTSTRAP");
 
-        match compile_probe() {
-            Some(status) if status.success() => {
-                println!("cargo:rustc-cfg=std_backtrace");
-                println!("cargo:rustc-cfg=error_generic_member_access");
-                error_generic_member_access = true;
-            }
-            _ => {}
+        if compile_probe() {
+            println!("cargo:rustc-cfg=std_backtrace");
+            println!("cargo:rustc-cfg=error_generic_member_access");
+            error_generic_member_access = true;
         }
     }
 
@@ -53,7 +50,7 @@ fn main() {
     }
 }
 
-fn compile_probe() -> Option<ExitStatus> {
+fn compile_probe() -> bool {
     if env::var_os("RUSTC_STAGE").is_some() {
         // We are running inside rustc bootstrap. This is a highly non-standard
         // environment with issues such as:
@@ -62,7 +59,7 @@ fn compile_probe() -> Option<ExitStatus> {
         //     https://github.com/rust-lang/rust/issues/114839
         //
         // Let's just not use nightly features here.
-        return None;
+        return false;
     }
 
     let rustc = cargo_env_var("RUSTC");
@@ -101,7 +98,10 @@ fn compile_probe() -> Option<ExitStatus> {
         }
     }
 
-    cmd.status().ok()
+    match cmd.status() {
+        Ok(status) => status.success(),
+        Err(_) => false,
+    }
 }
 
 fn rustc_minor_version() -> Option<u32> {