Skip to content

Commit a6f8a1d

Browse files
committed
Change some things to use step_info
1 parent e24f28a commit a6f8a1d

File tree

3 files changed

+9
-12
lines changed

3 files changed

+9
-12
lines changed

src/bootstrap/native.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ impl Step for Llvm {
145145
panic!("shared linking to LLVM is not currently supported on {}", target.triple);
146146
}
147147

148-
builder.info(&format!("Building LLVM for {}", target));
148+
builder.step_info(&self);
149149
t!(stamp.remove());
150150
let _time = util::timeit(&builder);
151151
t!(fs::create_dir_all(&out_dir));
@@ -566,7 +566,7 @@ impl Step for Lld {
566566
return out_dir;
567567
}
568568

569-
builder.info(&format!("Building LLD for {}", target));
569+
builder.step_info(&self);
570570
let _time = util::timeit(&builder);
571571
t!(fs::create_dir_all(&out_dir));
572572

@@ -666,7 +666,7 @@ impl Step for TestHelpers {
666666
return;
667667
}
668668

669-
builder.info("Building test helpers");
669+
builder.step_info(&self);
670670
t!(fs::create_dir_all(&dst));
671671
let mut cfg = cc::Build::new();
672672
// FIXME: Workaround for https://github.com/emscripten-core/emscripten/issues/9013
@@ -744,7 +744,7 @@ impl Step for Sanitizers {
744744
return runtimes;
745745
}
746746

747-
builder.info(&format!("Building sanitizers for {}", self.target));
747+
builder.step_info(&self);
748748
t!(stamp.remove());
749749
let _time = util::timeit(&builder);
750750

@@ -910,7 +910,7 @@ impl Step for CrtBeginEnd {
910910
return out_dir;
911911
}
912912

913-
builder.info("Building crtbegin.o and crtend.o");
913+
builder.step_info(&self);
914914
t!(fs::create_dir_all(&out_dir));
915915

916916
let mut cfg = cc::Build::new();

src/bootstrap/test.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1043,7 +1043,7 @@ impl Step for Tidy {
10431043
cmd.arg("--verbose");
10441044
}
10451045

1046-
builder.info("tidy check");
1046+
builder.step_info(&self);
10471047
try_run(builder, &mut cmd);
10481048

10491049
if builder.config.channel == "dev" || builder.config.channel == "nightly" {

src/bootstrap/tool.rs

+3-6
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ impl Step for ToolBuild {
4242

4343
fn info(step_info: &mut StepInfo<'_, '_, Self>) {
4444
let step = step_info.step;
45-
todo!("path");
45+
// todo!("path");
4646
step_info.compiler(&step.compiler).target(step.target).cmd(Kind::Build);
4747
}
4848

@@ -78,7 +78,7 @@ impl Step for ToolBuild {
7878
&self.extra_features,
7979
);
8080

81-
builder.info(&format!("Building stage{} tool {} ({})", compiler.stage, tool, target));
81+
builder.step_info(&self);
8282
let mut duplicates = Vec::new();
8383
let is_expected = compile::stream_cargo(builder, cargo, vec![], &mut |msg| {
8484
// Only care about big things like the RLS/Cargo for now
@@ -582,10 +582,7 @@ impl Step for Rustdoc {
582582
features.as_slice(),
583583
);
584584

585-
builder.info(&format!(
586-
"Building rustdoc for stage{} ({})",
587-
target_compiler.stage, target_compiler.host
588-
));
585+
builder.step_info(&self);
589586
builder.run(&mut cargo.into());
590587

591588
// Cargo adds a number of paths to the dylib search path on windows, which results in

0 commit comments

Comments
 (0)