Change some things to use step_info

rust-lang · Jul 24, 2021 · a6f8a1d · a6f8a1d
1 parent e24f28a
commit a6f8a1d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs
@@ -145,7 +145,7 @@ impl Step for Llvm {
             panic!("shared linking to LLVM is not currently supported on {}", target.triple);
         }
 
-        builder.info(&format!("Building LLVM for {}", target));
+        builder.step_info(&self);
         t!(stamp.remove());
         let _time = util::timeit(&builder);
         t!(fs::create_dir_all(&out_dir));
@@ -566,7 +566,7 @@ impl Step for Lld {
             return out_dir;
         }
 
-        builder.info(&format!("Building LLD for {}", target));
+        builder.step_info(&self);
         let _time = util::timeit(&builder);
         t!(fs::create_dir_all(&out_dir));
 
@@ -666,7 +666,7 @@ impl Step for TestHelpers {
             return;
         }
 
-        builder.info("Building test helpers");
+        builder.step_info(&self);
         t!(fs::create_dir_all(&dst));
         let mut cfg = cc::Build::new();
         // FIXME: Workaround for https://github.com/emscripten-core/emscripten/issues/9013
@@ -744,7 +744,7 @@ impl Step for Sanitizers {
             return runtimes;
         }
 
-        builder.info(&format!("Building sanitizers for {}", self.target));
+        builder.step_info(&self);
         t!(stamp.remove());
         let _time = util::timeit(&builder);
 
@@ -910,7 +910,7 @@ impl Step for CrtBeginEnd {
             return out_dir;
         }
 
-        builder.info("Building crtbegin.o and crtend.o");
+        builder.step_info(&self);
         t!(fs::create_dir_all(&out_dir));
 
         let mut cfg = cc::Build::new();

diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
@@ -1043,7 +1043,7 @@ impl Step for Tidy {
             cmd.arg("--verbose");
         }
 
-        builder.info("tidy check");
+        builder.step_info(&self);
         try_run(builder, &mut cmd);
 
         if builder.config.channel == "dev" || builder.config.channel == "nightly" {

diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs
@@ -42,7 +42,7 @@ impl Step for ToolBuild {
 
     fn info(step_info: &mut StepInfo<'_, '_, Self>) {
         let step = step_info.step;
-        todo!("path");
+        // todo!("path");
         step_info.compiler(&step.compiler).target(step.target).cmd(Kind::Build);
     }
 
@@ -78,7 +78,7 @@ impl Step for ToolBuild {
             &self.extra_features,
         );
 
-        builder.info(&format!("Building stage{} tool {} ({})", compiler.stage, tool, target));
+        builder.step_info(&self);
         let mut duplicates = Vec::new();
         let is_expected = compile::stream_cargo(builder, cargo, vec![], &mut |msg| {
             // Only care about big things like the RLS/Cargo for now
@@ -582,10 +582,7 @@ impl Step for Rustdoc {
             features.as_slice(),
         );
 
-        builder.info(&format!(
-            "Building rustdoc for stage{} ({})",
-            target_compiler.stage, target_compiler.host
-        ));
+        builder.step_info(&self);
         builder.run(&mut cargo.into());
 
         // Cargo adds a number of paths to the dylib search path on windows, which results in