Add StepInfo

Author: jyn514

src/bootstrap/builder.rs

@@ -68,7 +68,7 @@ pub(crate) trait Step: 'static + Clone + Debug + PartialEq + Eq + Hash {
         std::any::type_name::<Self>()
     }
 
-    fn info(_step_info: &mut StepInfo<'_, '_, Self>) {}
+    fn info(_step_info: &mut StepInfo<'_, '_, Self>);
 
     /// The path that should be used on the command line to run this step.
     fn path(&self, builder: &Builder<'_>) -> PathBuf {
@@ -706,6 +706,11 @@ impl<'a> Builder<'a> {
                 run.never()
             }
 
+            fn info(step_info: &mut StepInfo<'_, '_, Self>) {
+                let step = step_info.step;
+                step_info.compiler(&step.compiler).target(step.target).cmd(Kind::Check);
+            }
+
             fn run(self, builder: &Builder<'_>) -> Interned<PathBuf> {
                 let lib = builder.sysroot_libdir_relative(self.compiler);
                 let sysroot = builder
@@ -1822,15 +1827,25 @@ impl<'a, 'b, S> StepInfo<'a, 'b, S> {
         }
         // let stage = self.stage.unwrap_or(self.builder.top_stage);
         let stage = self.stage.expect("missing stage");
-        let host = self.host;
-        let kind = self.cmd.unwrap_or(self.builder.kind);
-        let target = self.target;
-        print!("{} {} --stage {}", kind, self.step.path(self.builder).display(), stage,);
-        if let Some(host) = host {
-            print!(" --host {}", host);
-        }
-        if let Some(target) = target {
-            print!(" --target {}", target);
+        // let kind = self.cmd.unwrap_or(self.builder.kind);
+        let kind = self.cmd.expect("missing kind");
+        print!(
+            "{} {} --stage {}",
+            kind,
+            self.step.path(self.builder).display(),
+            stage,
+        );
+        if let Some(host) = self.host {
+            // Almost always, this will be the same as build. Don't print it if so.
+            if host != self.builder.config.build {
+                print!(" --host {}", host);
+            }
+        }
+        if let Some(target) = self.target {
+            let different_from_host = self.host.map_or(false, |h| h != target);
+            if target != self.builder.config.build || different_from_host {
+                print!(" --target {}", target);
+            }
         }
         if kind == Kind::Test {
             for arg in self.builder.config.cmd.test_args() {

src/bootstrap/check.rs

@@ -262,6 +262,11 @@ impl Step for CodegenBackend {
         }
     }
 
+    fn info(step_info: &mut StepInfo<'_, '_, Self>) {
+        let step = step_info.step;
+        step_info.target(step.target).cmd(Kind::Check);
+    }
+
     fn run(self, builder: &Builder<'_>) {
         let compiler = builder.compiler(builder.top_stage, builder.config.build);
         let target = self.target;
@@ -281,10 +286,11 @@ impl Step for CodegenBackend {
             .arg(builder.src.join(format!("compiler/rustc_codegen_{}/Cargo.toml", backend)));
         rustc_cargo_env(builder, &mut cargo, target);
 
-        builder.info(&format!(
-            "Checking stage{} {} artifacts ({} -> {})",
-            builder.top_stage, backend, &compiler.host.triple, target.triple
-        ));
+        builder.step_info(&self);
+        // builder.info(&format!(
+        //     "Checking stage{} {} artifacts ({} -> {})",
+        //     builder.top_stage, backend, &compiler.host.triple, target.triple
+        // ));
 
         run_cargo(
             builder,
@@ -318,6 +324,13 @@ macro_rules! tool_check_step {
                 run.builder.ensure($name { target: run.target });
             }
 
+            fn info(step_info: &mut StepInfo<'_, '_, Self>) {
+                let step = step_info.step;
+                let builder = step_info.builder;
+                let compiler = builder.compiler(builder.top_stage, builder.config.build);
+                step_info.compiler(compiler).target(step.target).cmd(Kind::Check);
+            }
+
             fn run(self, builder: &Builder<'_>) {
                 let compiler = builder.compiler(builder.top_stage, builder.config.build);
                 let target = self.target;

src/bootstrap/compile.rs

@@ -113,10 +113,6 @@ impl Step for Std {
         std_cargo(builder, target, compiler.stage, &mut cargo);
 
         builder.step_info(&self);
-        // builder.info(&format!(
-        //     "Building stage{} std artifacts ({} -> {})",
-        //     compiler.stage, &compiler.host, target
-        // ));
         run_cargo(
             builder,
             cargo,
@@ -357,6 +353,8 @@ impl Step for StdLink {
         run.never()
     }
 
+    fn info(_step_info: &mut StepInfo<'_, '_, Self>) {}
+
     /// Link all libstd rlibs/dylibs into the sysroot location.
     ///
     /// Links those artifacts generated by `compiler` to the `stage` compiler's
@@ -453,6 +451,11 @@ impl Step for StartupObjects {
         });
     }
 
+    fn info(step_info: &mut StepInfo<'_, '_, Self>) {
+        let step = step_info.step;
+        step_info.compiler(&step.compiler).cmd(Kind::Build);
+    }
+
     /// Builds and prepare startup objects like rsbegin.o and rsend.o
     ///
     /// These are primarily used on Windows right now for linking executables/dlls.
@@ -614,10 +617,6 @@ impl Step for Rustc {
         }
 
         builder.step_info(&self);
-        // builder.info(&format!(
-        //     "Building stage{} compiler artifacts ({} -> {})",
-        //     compiler.stage, &compiler.host, target
-        // ));
         run_cargo(
             builder,
             cargo,
@@ -735,6 +734,8 @@ impl Step for RustcLink {
         run.never()
     }
 
+    fn info(_step_info: &mut StepInfo<'_, '_, Self>) {}
+
     /// Same as `std_link`, only for librustc
     fn run(self, builder: &Builder<'_>) {
         let compiler = self.compiler;
@@ -784,6 +785,11 @@ impl Step for CodegenBackend {
         }
     }
 
+    fn info(step_info: &mut StepInfo<'_, '_, Self>) {
+        let step = step_info.step;
+        step_info.compiler(&step.compiler).target(step.target).cmd(Kind::Build);
+    }
+
     fn run(self, builder: &Builder<'_>) {
         let compiler = self.compiler;
         let target = self.target;
@@ -945,6 +951,8 @@ impl Step for Sysroot {
         run.never()
     }
 
+    fn info(_step_info: &mut StepInfo<'_, '_, Self>) {}
+
     /// Returns the sysroot for the `compiler` specified that *this build system
     /// generates*.
     ///
@@ -1017,6 +1025,8 @@ impl Step for Assemble {
         run.never()
     }
 
+    fn info(_step_info: &mut StepInfo<'_, '_, Self>) {}
+
     /// Prepare a new compiler from the artifacts in `stage`
     ///
     /// This will assemble a compiler in `build/$host/stage$stage`. The compiler