Move CrateBuildHelper into bootstrap_self_tests

Author: jieyouxu

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

@@ -135,3 +135,40 @@ impl Step for Bootstrap {
         run_cargo_test(cargo, &["--test-threads=1"], &[], "bootstrap", None, host, builder);
     }
 }
+
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct CrateBuildHelper {
+    host: TargetSelection,
+}
+
+impl Step for CrateBuildHelper {
+    type Output = ();
+    const ONLY_HOSTS: bool = true;
+
+    fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
+        run.path("src/build_helper")
+    }
+
+    fn make_run(run: RunConfig<'_>) {
+        run.builder.ensure(CrateBuildHelper { host: run.target });
+    }
+
+    /// Runs `cargo test` for build_helper.
+    fn run(self, builder: &Builder<'_>) {
+        let host = self.host;
+        let compiler = builder.compiler(0, host);
+
+        let mut cargo = tool::prepare_tool_cargo(
+            builder,
+            compiler,
+            Mode::ToolBootstrap,
+            host,
+            Kind::Test,
+            "src/build_helper",
+            SourceType::InTree,
+            &[],
+        );
+        cargo.allow_features("test");
+        run_cargo_test(cargo, &[], &[], "build_helper", "build_helper self test", host, builder);
+    }
+}

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

@@ -70,43 +70,6 @@ pub(crate) use std_tests::TestFloatParse;
 pub(crate) use test_helpers::Crate;
 pub(crate) use tidy::Tidy;
 
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct CrateBuildHelper {
-    host: TargetSelection,
-}
-
-impl Step for CrateBuildHelper {
-    type Output = ();
-    const ONLY_HOSTS: bool = true;
-
-    fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
-        run.path("src/build_helper")
-    }
-
-    fn make_run(run: RunConfig<'_>) {
-        run.builder.ensure(CrateBuildHelper { host: run.target });
-    }
-
-    /// Runs `cargo test` for build_helper.
-    fn run(self, builder: &Builder<'_>) {
-        let host = self.host;
-        let compiler = builder.compiler(0, host);
-
-        let mut cargo = tool::prepare_tool_cargo(
-            builder,
-            compiler,
-            Mode::ToolBootstrap,
-            host,
-            Kind::Test,
-            "src/build_helper",
-            SourceType::InTree,
-            &[],
-        );
-        cargo.allow_features("test");
-        run_cargo_test(cargo, &[], &[], "build_helper", "build_helper self test", host, builder);
-    }
-}
-
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct Distcheck;