Move build_miri_sysroot out of the Miri test step

This helper function is used by the test step type that contained it, but it is
also used by other miri-related steps.

Author: Zalathar

src/bootstrap/src/core/build_steps/run.rs

@@ -7,7 +7,7 @@ use std::path::PathBuf;
 
 use crate::Mode;
 use crate::core::build_steps::dist::distdir;
-use crate::core::build_steps::test;
+use crate::core::build_steps::test::build_miri_sysroot;
 use crate::core::build_steps::tool::{self, SourceType, Tool};
 use crate::core::builder::{Builder, Kind, RunConfig, ShouldRun, Step};
 use crate::core::config::TargetSelection;
@@ -132,7 +132,7 @@ impl Step for Miri {
         let host_compiler = builder.compiler(stage - 1, host);
 
         // Get a target sysroot for Miri.
-        let miri_sysroot = test::Miri::build_miri_sysroot(builder, target_compiler, target);
+        let miri_sysroot = build_miri_sysroot(builder, target_compiler, target);
 
         // # Run miri.
         // Running it via `cargo run` as that figures out the right dylib path.

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

@@ -437,47 +437,44 @@ pub struct Miri {
     target: TargetSelection,
 }
 
-impl Miri {
-    /// Run `cargo miri setup` for the given target, return where the Miri sysroot was put.
-    pub fn build_miri_sysroot(
-        builder: &Builder<'_>,
-        compiler: Compiler,
-        target: TargetSelection,
-    ) -> PathBuf {
-        let miri_sysroot = builder.out.join(compiler.host).join("miri-sysroot");
-        let mut cargo = builder::Cargo::new(
-            builder,
-            compiler,
-            Mode::Std,
-            SourceType::Submodule,
-            target,
-            Kind::MiriSetup,
-        );
+/// Run `cargo miri setup` for the given target, return where the Miri sysroot was put.
+pub(crate) fn build_miri_sysroot(
+    builder: &Builder<'_>,
+    compiler: Compiler,
+    target: TargetSelection,
+) -> PathBuf {
+    let miri_sysroot = builder.out.join(compiler.host).join("miri-sysroot");
+    let mut cargo = builder::Cargo::new(
+        builder,
+        compiler,
+        Mode::Std,
+        SourceType::Submodule,
+        target,
+        Kind::MiriSetup,
+    );
 
-        // Tell `cargo miri setup` where to find the sources.
-        cargo.env("MIRI_LIB_SRC", builder.src.join("library"));
-        // Tell it where to put the sysroot.
-        cargo.env("MIRI_SYSROOT", &miri_sysroot);
+    // Tell `cargo miri setup` where to find the sources.
+    cargo.env("MIRI_LIB_SRC", builder.src.join("library"));
+    // Tell it where to put the sysroot.
+    cargo.env("MIRI_SYSROOT", &miri_sysroot);
 
-        let mut cargo = BootstrapCommand::from(cargo);
-        let _guard =
-            builder.msg(Kind::Build, compiler.stage, "miri sysroot", compiler.host, target);
-        cargo.run(builder);
+    let mut cargo = BootstrapCommand::from(cargo);
+    let _guard = builder.msg(Kind::Build, compiler.stage, "miri sysroot", compiler.host, target);
+    cargo.run(builder);
 
-        // # Determine where Miri put its sysroot.
-        // To this end, we run `cargo miri setup --print-sysroot` and capture the output.
-        // (We do this separately from the above so that when the setup actually
-        // happens we get some output.)
-        // We re-use the `cargo` from above.
-        cargo.arg("--print-sysroot");
+    // # Determine where Miri put its sysroot.
+    // To this end, we run `cargo miri setup --print-sysroot` and capture the output.
+    // (We do this separately from the above so that when the setup actually
+    // happens we get some output.)
+    // We re-use the `cargo` from above.
+    cargo.arg("--print-sysroot");
 
-        builder.verbose(|| println!("running: {cargo:?}"));
-        let stdout = cargo.run_capture_stdout(builder).stdout();
-        // Output is "<sysroot>\n".
-        let sysroot = stdout.trim_end();
-        builder.verbose(|| println!("`cargo miri setup --print-sysroot` said: {sysroot:?}"));
-        PathBuf::from(sysroot)
-    }
+    builder.verbose(|| println!("running: {cargo:?}"));
+    let stdout = cargo.run_capture_stdout(builder).stdout();
+    // Output is "<sysroot>\n".
+    let sysroot = stdout.trim_end();
+    builder.verbose(|| println!("`cargo miri setup --print-sysroot` said: {sysroot:?}"));
+    PathBuf::from(sysroot)
 }
 
 impl Step for Miri {
@@ -517,7 +514,7 @@ impl Step for Miri {
 
         // We also need sysroots, for Miri and for the host (the latter for build scripts).
         // This is for the tests so everything is done with the target compiler.
-        let miri_sysroot = Miri::build_miri_sysroot(builder, target_compiler, target);
+        let miri_sysroot = build_miri_sysroot(builder, target_compiler, target);
         builder.ensure(compile::Std::new(target_compiler, host));
         let host_sysroot = builder.sysroot(target_compiler);
 

src/bootstrap/src/core/builder/cargo.rs

@@ -3,8 +3,9 @@ use std::ffi::{OsStr, OsString};
 use std::path::{Path, PathBuf};
 
 use super::{Builder, Kind};
+use crate::core::build_steps::compile;
+use crate::core::build_steps::test::build_miri_sysroot;
 use crate::core::build_steps::tool::SourceType;
-use crate::core::build_steps::{compile, test};
 use crate::core::config::SplitDebuginfo;
 use crate::core::config::flags::Color;
 use crate::utils::helpers::{
@@ -808,7 +809,7 @@ impl Builder<'_> {
         if cmd_kind == Kind::MiriTest {
             self.ensure(compile::Std::new(compiler, compiler.host));
             let host_sysroot = self.sysroot(compiler);
-            let miri_sysroot = test::Miri::build_miri_sysroot(self, compiler, target);
+            let miri_sysroot = build_miri_sysroot(self, compiler, target);
             cargo.env("MIRI_SYSROOT", &miri_sysroot);
             cargo.env("MIRI_HOST_SYSROOT", &host_sysroot);
         }