Inline the .expect() from bootstrap::python() and remove it

The choice of default for macOS was moved to sanity::check()

Author: xSetech

src/bootstrap/src/core/build_steps/test.rs

@@ -2075,7 +2075,13 @@ Please disable assertions with `rust.debug-assertions = false`.
             cmd.arg("--target-rustcflags").arg(flag);
         }
 
-        cmd.arg("--python").arg(builder.python());
+        cmd.arg("--python").arg(
+            builder
+                .config
+                .python
+                .as_ref()
+                .expect("python is required for running LLDB or rustdoc tests"),
+        );
 
         // FIXME(#148099): Currently we set these Android-related flags in all
         // modes, even though they should only be needed in "debuginfo" mode,
@@ -3359,7 +3365,9 @@ impl Step for BootstrapPy {
     }
 
     fn run(self, builder: &Builder<'_>) -> Self::Output {
-        let mut check_bootstrap = command(builder.python());
+        let mut check_bootstrap = command(
+            builder.config.python.as_ref().expect("python is required for running bootstrap tests"),
+        );
         check_bootstrap
             .args(["-m", "unittest", "bootstrap_test.py"])
             // Forward command-line args after `--` to unittest, for filtering etc.

src/bootstrap/src/lib.rs

@@ -1522,22 +1522,6 @@ impl Build {
         self.config.target_config.get(&target).and_then(|t| t.qemu_rootfs.as_ref()).map(|p| &**p)
     }
 
-    /// Path to the python interpreter to use
-    fn python(&self) -> &Path {
-        if self.config.host_target.ends_with("apple-darwin") {
-            // LLDB tests require the Python version the LLDB plugin was built for.
-            // On macOS, the system Python/LLDB are compatible. Many users install
-            // Homebrew Python but not Homebrew LLVM, so default to system Python.
-            // Can be overridden via `build.python` for custom LLVM installations.
-            self.config.python.as_deref().unwrap_or_else(|| Path::new("/usr/bin/python3"))
-        } else {
-            self.config
-                .python
-                .as_ref()
-                .expect("python is required for running LLDB or rustdoc tests")
-        }
-    }
-
     /// Temporary directory that extended error information is emitted to.
     fn extended_error_dir(&self) -> PathBuf {
         self.out.join("tmp/extended-error-metadata")