Skip to content

Commit 3dc03a2

Browse files
committed
Rename make_run_crates to expand_alias
1 parent 8077b34 commit 3dc03a2

5 files changed

Lines changed: 5 additions & 5 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ impl Step for Rustc {
330330
}
331331

332332
fn make_run(run: RunConfig<'_>) {
333-
let crates = run.make_run_crates(Alias::Compiler);
333+
let crates = run.expand_alias(Alias::Compiler);
334334
run.builder.ensure(Rustc::new(run.builder, run.target, crates));
335335
}
336336

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ impl Step for Rustc {
266266

267267
fn make_run(run: RunConfig<'_>) {
268268
let builder = run.builder;
269-
let crates = run.make_run_crates(Alias::Compiler);
269+
let crates = run.expand_alias(Alias::Compiler);
270270
let config = LintConfig::new(run.builder);
271271
run.builder.ensure(Rustc::new(builder, run.target, config, crates));
272272
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ fn copy_self_contained_objects(
472472
/// Resolves standard library crates for `Std::run_make` for any build kind (like check, doc,
473473
/// build, clippy, etc.).
474474
pub fn std_crates_for_run_make(run: &RunConfig<'_>) -> Vec<String> {
475-
let mut crates = run.make_run_crates(builder::Alias::Library);
475+
let mut crates = run.expand_alias(builder::Alias::Library);
476476

477477
// For no_std targets, we only want to check core and alloc
478478
// Regardless of core/alloc being selected explicitly or via the "library" default alias,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2867,7 +2867,7 @@ impl Step for CrateLibrustc {
28672867
let builder = run.builder;
28682868
let host = run.build_triple();
28692869
let build_compiler = builder.compiler(builder.top_stage - 1, host);
2870-
let crates = run.make_run_crates(Alias::Compiler);
2870+
let crates = run.expand_alias(Alias::Compiler);
28712871

28722872
builder.ensure(CrateLibrustc { build_compiler, target: run.target, crates });
28732873
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ impl RunConfig<'_> {
274274
/// Normally, people will pass *just* `library` if they pass it.
275275
/// But it's possible (although strange) to pass something like `library std core`.
276276
/// Build all crates anyway, as if they hadn't passed the other args.
277-
pub fn make_run_crates(&self, alias: Alias) -> Vec<String> {
277+
pub fn expand_alias(&self, alias: Alias) -> Vec<String> {
278278
let has_alias =
279279
self.paths.iter().any(|set| set.assert_single_path().path.ends_with(alias.as_str()));
280280
if !has_alias {

0 commit comments

Comments
 (0)