Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/bootstrap/src/core/build_steps/check.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use std::path::{Path, PathBuf};

use crate::core::build_steps::compile::{
ArtifactKeepMode, add_to_sysroot, run_cargo, rustc_cargo, rustc_cargo_env, std_cargo,
std_crates_for_run_make,
std_crates_for_make_run,
};
use crate::core::build_steps::tool;
use crate::core::build_steps::tool::{
Expand Down Expand Up @@ -68,7 +68,7 @@ impl Step for Std {
// Explicitly pass -p for all dependencies crates -- this will force cargo
// to also check the tests/benches/examples for these crates, rather
// than just the leaf crate.
let crates = std_crates_for_run_make(&run);
let crates = std_crates_for_make_run(&run);
run.builder.ensure(Std {
build_compiler: prepare_compiler_for_check(run.builder, run.target, Mode::Std)
.build_compiler(),
Expand Down
7 changes: 4 additions & 3 deletions src/bootstrap/src/core/build_steps/clippy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@
//! to pass a prebuilt Clippy from the outside when running `cargo clippy`, but that would be
//! (as usual) a massive undertaking/refactoring.

use super::compile::{ArtifactKeepMode, run_cargo, rustc_cargo, std_cargo};
use super::tool::{SourceType, prepare_tool_cargo};
use crate::builder::{Builder, ShouldRun};
use crate::core::build_steps::check::{CompilerForCheck, prepare_compiler_for_check};
use crate::core::build_steps::compile::std_crates_for_run_make;
use crate::core::build_steps::compile::{
ArtifactKeepMode, run_cargo, rustc_cargo, std_cargo, std_crates_for_make_run,
};
use crate::core::builder;
use crate::core::builder::{Alias, Kind, RunConfig, Step, StepMetadata, crate_description};
use crate::utils::build_stamp::{self, BuildStamp};
Expand Down Expand Up @@ -178,7 +179,7 @@ impl Step for Std {
}

fn make_run(run: RunConfig<'_>) {
let crates = std_crates_for_run_make(&run);
let crates = std_crates_for_make_run(&run);
let config = LintConfig::new(run.builder);
run.builder.ensure(Std::new(run.builder, run.target, config, crates));
}
Expand Down
6 changes: 3 additions & 3 deletions src/bootstrap/src/core/build_steps/compile.rs
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ impl Step for Std {
}

fn make_run(run: RunConfig<'_>) {
let crates = std_crates_for_run_make(&run);
let crates = std_crates_for_make_run(&run);
let builder = run.builder;

// Force compilation of the standard library from source if the `library` is modified. This allows
Expand Down Expand Up @@ -479,9 +479,9 @@ fn copy_self_contained_objects(
target_deps
}

/// Resolves standard library crates for `Std::run_make` for any build kind (like check, doc,
/// Resolves standard library crates for [`Std::make_run`] for any build kind (like check, doc,
/// build, clippy, etc.).
pub fn std_crates_for_run_make(run: &RunConfig<'_>) -> Vec<String> {
pub fn std_crates_for_make_run(run: &RunConfig<'_>) -> Vec<String> {
let mut crates = run.make_run_crates(builder::Alias::Library);

// For no_std targets, we only want to check core and alloc
Expand Down
2 changes: 1 addition & 1 deletion src/bootstrap/src/core/build_steps/doc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,7 @@ impl Step for Std {
}

fn make_run(run: RunConfig<'_>) {
let crates = compile::std_crates_for_run_make(&run);
let crates = compile::std_crates_for_make_run(&run);
let target_is_no_std = run.builder.no_std(run.target).unwrap_or(false);
if crates.is_empty() && target_is_no_std {
return;
Expand Down
Loading