From 607db5d86ebe5cc7a165fc55eafb65fa44883a6e Mon Sep 17 00:00:00 2001 From: lucarlig Date: Sat, 19 Oct 2024 15:29:04 +0100 Subject: [PATCH] implement requested changes for PR --- src/bootstrap/src/core/build_steps/test.rs | 4 +--- src/bootstrap/src/core/build_steps/tool.rs | 13 +++---------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src/bootstrap/src/core/build_steps/test.rs b/src/bootstrap/src/core/build_steps/test.rs index 03fe66f020267..0a160ce418213 100644 --- a/src/bootstrap/src/core/build_steps/test.rs +++ b/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( diff --git a/src/bootstrap/src/core/build_steps/tool.rs b/src/bootstrap/src/core/build_steps/tool.rs index 6929e2093ddf3..630755680653a 100644 --- a/src/bootstrap/src/core/build_steps/tool.rs +++ b/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,26 +1110,20 @@ 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, + path: "src/etc/test-float-parse", source_type: SourceType::InTree, extra_features: Vec::new(), allow_features: "",