Use pretty_step_name in step_graph

Author: Kobzol

src/bootstrap/src/core/builder/mod.rs

@@ -1717,7 +1717,7 @@ You have to build a stage1 compiler for `{}` first, and then use it to build a s
                     // We cannot use a dynamic name here, so instead we record the actual step name
                     // in the step_name field.
                     "step",
-                    step_name = step_name::<S>(),
+                    step_name = pretty_step_name::<S>(),
                     args = step_debug_args(&step)
                 );
                 span.entered()
@@ -1819,7 +1819,7 @@ You have to build a stage1 compiler for `{}` first, and then use it to build a s
 }
 
 /// Return qualified step name, e.g. `compile::Rustc`.
-fn step_name<S: Step>() -> String {
+pub fn pretty_step_name<S: Step>() -> String {
     // Normalize step type path to only keep the module and the type name
     let path = type_name::<S>().rsplit("::").take(2).collect::<Vec<_>>();
     path.into_iter().rev().collect::<Vec<_>>().join("::")
@@ -1834,7 +1834,7 @@ fn step_debug_args<S: Step>(step: &S) -> String {
 }
 
 fn pretty_print_step<S: Step>(step: &S) -> String {
-    format!("{} {{ {} }}", step_name::<S>(), step_debug_args(step))
+    format!("{} {{ {} }}", pretty_step_name::<S>(), step_debug_args(step))
 }
 
 impl<'a> AsRef<ExecutionContext> for Builder<'a> {

src/bootstrap/src/utils/step_graph.rs

@@ -3,7 +3,7 @@ use std::fmt::Debug;
 use std::io::BufWriter;
 use std::path::Path;
 
-use crate::core::builder::{AnyDebug, Step};
+use crate::core::builder::{AnyDebug, Step, pretty_step_name};
 use crate::t;
 
 /// Records the executed steps and their dependencies in a directed graph,
@@ -43,13 +43,7 @@ impl StepGraph {
                 metadata.get_target()
             )
         } else {
-            let type_name = std::any::type_name::<S>();
-            type_name
-                .strip_prefix("bootstrap::core::")
-                .unwrap_or(type_name)
-                .strip_prefix("build_steps::")
-                .unwrap_or(type_name)
-                .to_string()
+            pretty_step_name::<S>()
         };
 
         let node = Node { label, tooltip: node_key.clone() };