bootstrap: Refactor and rename a bunch of path handling

src/bootstrap/src/core/build_steps/check.rs

@@ -330,7 +330,7 @@ impl Step for Rustc {
     }
 
     fn make_run(run: RunConfig<'_>) {
-        let crates = run.make_run_crates(Alias::Compiler);
+        let crates = run.expand_alias(Alias::Compiler);
         run.builder.ensure(Rustc::new(run.builder, run.target, crates));
     }
 

src/bootstrap/src/core/build_steps/clippy.rs

@@ -266,7 +266,7 @@ impl Step for Rustc {
 
     fn make_run(run: RunConfig<'_>) {
         let builder = run.builder;
-        let crates = run.make_run_crates(Alias::Compiler);
+        let crates = run.expand_alias(Alias::Compiler);
         let config = LintConfig::new(run.builder);
         run.builder.ensure(Rustc::new(builder, run.target, config, crates));
     }

src/bootstrap/src/core/build_steps/compile.rs

@@ -472,7 +472,7 @@ fn copy_self_contained_objects(
 /// Resolves standard library crates for `Std::run_make` for any build kind (like check, doc,
 /// build, clippy, etc.).
 pub fn std_crates_for_run_make(run: &RunConfig<'_>) -> Vec<String> {
-    let mut crates = run.make_run_crates(builder::Alias::Library);
+    let mut crates = run.expand_alias(builder::Alias::Library);
 
     // For no_std targets, we only want to check core and alloc
     // Regardless of core/alloc being selected explicitly or via the "library" default alias,

src/bootstrap/src/core/build_steps/test.rs

@@ -41,7 +41,7 @@ use crate::utils::helpers::{
     linker_args, linker_flags, t, target_supports_cranelift_backend, up_to_date,
 };
 use crate::utils::render_tests::{add_flags_and_try_run_tests, try_run_tests};
-use crate::{CLang, CodegenBackendKind, DocTests, GitRepo, Mode, PathSet, envify};
+use crate::{CLang, CodegenBackendKind, DocTests, GitRepo, Mode, StepSelectors, envify};
 
 mod compiletest;
 
@@ -1697,15 +1697,15 @@ impl Step for Coverage {
         // determine which modes to run in.
         for path in &run.paths {
             match path {
-                PathSet::Set(_) => {
+                StepSelectors::Set(_) => {
                     for &mode in Self::ALL_MODES {
                         if path.assert_single_path().path == Path::new(mode.as_str()) {
                             modes.push(mode);
                             break;
                         }
                     }
                 }
-                PathSet::Suite(_) => {
+                StepSelectors::TestSuite(_) => {
                     modes.extend_from_slice(Self::ALL_MODES);
                     break;
                 }
@@ -2867,7 +2867,7 @@ impl Step for CrateLibrustc {
         let builder = run.builder;
         let host = run.build_triple();
         let build_compiler = builder.compiler(builder.top_stage - 1, host);
-        let crates = run.make_run_crates(Alias::Compiler);
+        let crates = run.expand_alias(Alias::Compiler);
 
         builder.ensure(CrateLibrustc { build_compiler, target: run.target, crates });
     }
@@ -3816,7 +3816,7 @@ impl Step for CodegenCranelift {
     const IS_HOST: bool = true;
 
     fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
-        run.paths(&["compiler/rustc_codegen_cranelift"])
+        run.path("compiler/rustc_codegen_cranelift")
     }
 
     fn is_default_step(_builder: &Builder<'_>) -> bool {
@@ -3937,7 +3937,7 @@ impl Step for CodegenGCC {
     const IS_HOST: bool = true;
 
     fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
-        run.paths(&["compiler/rustc_codegen_gcc"])
+        run.path("compiler/rustc_codegen_gcc")
     }
 
     fn is_default_step(_builder: &Builder<'_>) -> bool {

src/bootstrap/src/core/build_steps/tool.rs

@@ -1089,6 +1089,7 @@ impl Step for RustAnalyzerProcMacroSrv {
         // Allow building `rust-analyzer-proc-macro-srv` both as part of the `rust-analyzer` and as a stand-alone tool.
         run.path("src/tools/rust-analyzer")
             .path("src/tools/rust-analyzer/crates/proc-macro-srv-cli")
+            .alias("rust-analyzer-proc-macro-srv")
     }
 
     fn is_default_step(builder: &Builder<'_>) -> bool {