@@ -398,7 +398,14 @@ impl Step for RustAnalyzer {
398398}
399399
400400macro_rules! tool_check_step {
401- ( $name: ident, $path: literal, $( $alias: literal, ) * $source_type: path $( , $default: literal ) ?) => {
401+ (
402+ $name: ident,
403+ $display_name: literal,
404+ $path: literal,
405+ $( $alias: literal, ) *
406+ $source_type: path
407+ $( , $default: literal ) ?
408+ ) => {
402409 #[ derive( Debug , Clone , PartialEq , Eq , Hash ) ]
403410 pub struct $name {
404411 pub target: TargetSelection ,
@@ -441,7 +448,7 @@ macro_rules! tool_check_step {
441448 cargo. arg( "--all-targets" ) ;
442449 }
443450
444- let _guard = builder. msg_check( & concat! ( stringify! ( $name ) , " artifacts") . to_lowercase ( ) , target) ;
451+ let _guard = builder. msg_check( & format! ( "{} artifacts", $display_name ) , target) ;
445452 run_cargo(
446453 builder,
447454 cargo,
@@ -468,20 +475,30 @@ macro_rules! tool_check_step {
468475 } ;
469476}
470477
471- tool_check_step ! ( Rustdoc , "src/tools/rustdoc" , "src/librustdoc" , SourceType :: InTree ) ;
478+ tool_check_step ! ( Rustdoc , "rustdoc" , " src/tools/rustdoc", "src/librustdoc" , SourceType :: InTree ) ;
472479// Clippy, miri and Rustfmt are hybrids. They are external tools, but use a git subtree instead
473480// of a submodule. Since the SourceType only drives the deny-warnings
474481// behavior, treat it as in-tree so that any new warnings in clippy will be
475482// rejected.
476- tool_check_step ! ( Clippy , "src/tools/clippy" , SourceType :: InTree ) ;
477- tool_check_step ! ( Miri , "src/tools/miri" , SourceType :: InTree ) ;
478- tool_check_step ! ( CargoMiri , "src/tools/miri/cargo-miri" , SourceType :: InTree ) ;
479- tool_check_step ! ( Rls , "src/tools/rls" , SourceType :: InTree ) ;
480- tool_check_step ! ( Rustfmt , "src/tools/rustfmt" , SourceType :: InTree ) ;
481- tool_check_step ! ( MiroptTestTools , "src/tools/miropt-test-tools" , SourceType :: InTree ) ;
482- tool_check_step ! ( TestFloatParse , "src/etc/test-float-parse" , SourceType :: InTree ) ;
483-
484- tool_check_step ! ( Bootstrap , "src/bootstrap" , SourceType :: InTree , false ) ;
483+ tool_check_step ! ( Clippy , "clippy" , "src/tools/clippy" , SourceType :: InTree ) ;
484+ tool_check_step ! ( Miri , "miri" , "src/tools/miri" , SourceType :: InTree ) ;
485+ tool_check_step ! ( CargoMiri , "cargo-miri" , "src/tools/miri/cargo-miri" , SourceType :: InTree ) ;
486+ tool_check_step ! ( Rls , "rls" , "src/tools/rls" , SourceType :: InTree ) ;
487+ tool_check_step ! ( Rustfmt , "rustfmt" , "src/tools/rustfmt" , SourceType :: InTree ) ;
488+ tool_check_step ! (
489+ MiroptTestTools ,
490+ "miropt-test-tools" ,
491+ "src/tools/miropt-test-tools" ,
492+ SourceType :: InTree
493+ ) ;
494+ tool_check_step ! (
495+ TestFloatParse ,
496+ "test-float-parse" ,
497+ "src/etc/test-float-parse" ,
498+ SourceType :: InTree
499+ ) ;
500+
501+ tool_check_step ! ( Bootstrap , "bootstrap" , "src/bootstrap" , SourceType :: InTree , false ) ;
485502
486503/// Cargo's output path for the standard library in a given stage, compiled
487504/// by a particular compiler for the specified target.
0 commit comments