more progress

- add stage override
- switch more things to step_info

Author: jyn514

src/bootstrap/builder.rs

@@ -73,6 +73,11 @@ pub trait Step: 'static + Clone + Debug + PartialEq + Eq + Hash {
         paths.iter().map(|pathset| pathset.path(builder)).next().expect("no paths for step")
     }
 
+    /// The stage that should be passed to x.py to run this step.
+    fn stage(&self, builder: &Builder<'_>) -> u32 {
+        builder.top_stage
+    }
+
     /// Primary function to execute this rule. Can call `builder.ensure()`
     /// with other steps to run those.
     fn run(self, builder: &Builder<'_>) -> Self::Output;
@@ -655,8 +660,7 @@ impl<'a> Builder<'a> {
             // TODO: this is wrong, e.g. `check --stage 1` runs build commands first
             self.kind,
             step.path(self).display(),
-            // FIXME: top_stage might be higher than the stage of the step
-            self.top_stage,
+            step.stage(self),
         );
         for arg in self.config.cmd.test_args() {
             print!(" --test-args \"{}\"", arg);

src/bootstrap/check.rs

@@ -86,10 +86,11 @@ impl Step for Std {
         );
         std_cargo(builder, target, compiler.stage, &mut cargo);
 
-        builder.info(&format!(
-            "Checking stage{} std artifacts ({} -> {})",
-            builder.top_stage, &compiler.host, target
-        ));
+        builder.step_info(&self);
+        // builder.info(&format!(
+        //     "Checking stage{} std artifacts ({} -> {})",
+        //     builder.top_stage, &compiler.host, target
+        // ));
         run_cargo(
             builder,
             cargo,
@@ -206,10 +207,11 @@ impl Step for Rustc {
             cargo.arg("-p").arg(krate.name);
         }
 
-        builder.info(&format!(
-            "Checking stage{} compiler artifacts ({} -> {})",
-            builder.top_stage, &compiler.host, target
-        ));
+        builder.step_info(&self);
+        // builder.info(&format!(
+        //     "Checking stage{} compiler artifacts ({} -> {})",
+        //     builder.top_stage, &compiler.host, target
+        // ));
         run_cargo(
             builder,
             cargo,
@@ -328,13 +330,14 @@ macro_rules! tool_check_step {
                 // See https://github.com/rust-lang/rust/pull/80573#issuecomment-754010776
                 cargo.rustflag("-Zunstable-options");
 
-                builder.info(&format!(
-                    "Checking stage{} {} artifacts ({} -> {})",
-                    builder.top_stage,
-                    stringify!($name).to_lowercase(),
-                    &compiler.host.triple,
-                    target.triple
-                ));
+                builder.step_info(&self);
+                // builder.info(&format!(
+                //     "Checking stage{} {} artifacts ({} -> {})",
+                //     builder.top_stage,
+                //     stringify!($name).to_lowercase(),
+                //     &compiler.host.triple,
+                //     target.triple
+                // ));
                 run_cargo(
                     builder,
                     cargo,

src/bootstrap/compile.rs

@@ -519,6 +519,10 @@ impl Step for Rustc {
         });
     }
 
+    fn stage(&self, _builder: &Builder<'_>) -> u32 {
+        self.compiler.stage
+    }
+
     /// Builds the compiler.
     ///
     /// This will build the compiler for a particular stage of the build using
@@ -603,10 +607,11 @@ impl Step for Rustc {
             ));
         }
 
-        builder.info(&format!(
-            "Building stage{} compiler artifacts ({} -> {})",
-            compiler.stage, &compiler.host, target
-        ));
+        builder.step_info(&self);
+        // builder.info(&format!(
+        //     "Building stage{} compiler artifacts ({} -> {})",
+        //     compiler.stage, &compiler.host, target
+        // ));
         run_cargo(
             builder,
             cargo,

src/bootstrap/tool.rs

@@ -319,6 +319,10 @@ macro_rules! bootstrap_tool {
         impl Step for $name {
             type Output = PathBuf;
 
+            fn stage(&self, _builder: &Builder<'_>) -> u32 {
+                self.compiler.stage
+            }
+
             fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
                 run.path($path)
             }
@@ -595,6 +599,10 @@ impl Step for Cargo {
     const DEFAULT: bool = true;
     const ONLY_HOSTS: bool = true;
 
+    fn stage(&self, _builder: &Builder<'_>) -> u32 {
+        self.compiler.stage
+    }
+
     fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
         let builder = run.builder;
         run.path("src/tools/cargo").default_condition(