Skip to content

Commit 607db5d

Browse files
committed
implement requested changes for PR
1 parent 157d9b2 commit 607db5d

File tree

2 files changed

+4
-13
lines changed

2 files changed

+4
-13
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3549,9 +3549,7 @@ impl Step for TestFloatParse {
35493549
let path = self.path.to_str().unwrap();
35503550
let crate_name = self.path.components().last().unwrap().as_os_str().to_str().unwrap();
35513551

3552-
if !builder.download_rustc() {
3553-
builder.ensure(tool::TestFloatParse { path: path.into(), host: self.host });
3554-
}
3552+
builder.ensure(tool::TestFloatParse { host: self.host });
35553553

35563554
// Run any unit tests in the crate
35573555
let cargo_test = tool::prepare_tool_cargo(

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

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1098,7 +1098,6 @@ tool_extended!((self, builder),
10981098

10991099
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
11001100
pub struct TestFloatParse {
1101-
pub path: PathBuf,
11021101
pub host: TargetSelection,
11031102
}
11041103

@@ -1111,26 +1110,20 @@ impl Step for TestFloatParse {
11111110
run.path("src/etc/test-float-parse")
11121111
}
11131112

1114-
fn make_run(run: RunConfig<'_>) {
1115-
for path in run.paths {
1116-
let path = path.assert_single_path().path.clone();
1117-
run.builder.ensure(Self { path, host: run.target });
1118-
}
1113+
fn make_run(_run: RunConfig<'_>) {
1114+
unimplemented!()
11191115
}
11201116

11211117
fn run(self, builder: &Builder<'_>) {
11221118
let bootstrap_host = builder.config.build;
11231119
let compiler = builder.compiler(builder.top_stage, bootstrap_host);
1124-
let path: &'static str =
1125-
Box::leak(self.path.to_str().unwrap().to_string().into_boxed_str());
1126-
11271120
if !builder.download_rustc() {
11281121
builder.ensure(ToolBuild {
11291122
compiler,
11301123
target: bootstrap_host,
11311124
tool: "test-float-parse",
11321125
mode: Mode::ToolStd,
1133-
path,
1126+
path: "src/etc/test-float-parse",
11341127
source_type: SourceType::InTree,
11351128
extra_features: Vec::new(),
11361129
allow_features: "",

0 commit comments

Comments
 (0)