builder ensure not conditional and removed path in tool module

Author: lucarlig

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

@@ -3549,9 +3549,7 @@ impl Step for TestFloatParse {
         let path = self.path.to_str().unwrap();
         let crate_name = self.path.components().last().unwrap().as_os_str().to_str().unwrap();
 
-        if !builder.download_rustc() {
-            builder.ensure(tool::TestFloatParse { path: path.into(), host: self.host });
-        }
+        builder.ensure(tool::TestFloatParse { host: self.host });
 
         // Run any unit tests in the crate
         let cargo_test = tool::prepare_tool_cargo(

src/bootstrap/src/core/build_steps/tool.rs

@@ -1098,7 +1098,6 @@ tool_extended!((self, builder),
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct TestFloatParse {
-    pub path: PathBuf,
     pub host: TargetSelection,
 }
 
@@ -1111,32 +1110,25 @@ impl Step for TestFloatParse {
         run.path("src/etc/test-float-parse")
     }
 
-    fn make_run(run: RunConfig<'_>) {
-        for path in run.paths {
-            let path = path.assert_single_path().path.clone();
-            run.builder.ensure(Self { path, host: run.target });
-        }
+    fn make_run(_run: RunConfig<'_>) {
+        unimplemented!()
     }
 
     fn run(self, builder: &Builder<'_>) {
         let bootstrap_host = builder.config.build;
         let compiler = builder.compiler(builder.top_stage, bootstrap_host);
-        let path: &'static str =
-            Box::leak(self.path.to_str().unwrap().to_string().into_boxed_str());
 
-        if !builder.download_rustc() {
-            builder.ensure(ToolBuild {
-                compiler,
-                target: bootstrap_host,
-                tool: "test-float-parse",
-                mode: Mode::ToolStd,
-                path,
-                source_type: SourceType::InTree,
-                extra_features: Vec::new(),
-                allow_features: "",
-                cargo_args: Vec::new(),
-            });
-        }
+        builder.ensure(ToolBuild {
+            compiler,
+            target: bootstrap_host,
+            tool: "test-float-parse",
+            mode: Mode::ToolStd,
+            path: "src/etc/test-float-parse",
+            source_type: SourceType::InTree,
+            extra_features: Vec::new(),
+            allow_features: "",
+            cargo_args: Vec::new(),
+        });
     }
 }