nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-05-14 02:49:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move most of Step::should_run out of tool_extended!

Browse Source
This commit is contained in:
Zalathar 2025-01-02 00:13:29 +11:00
parent 08d70f57e2
commit 5a32a35ab7
1 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/bootstrap/src/core/build_steps/tool.rs
View File

@ -1024,24 +1024,15 @@ macro_rules! tool_extended {
impl Step for $name {
type Output = PathBuf;
const DEFAULT: bool = true; // Overwritten below
const DEFAULT: bool = true; // Overridden by `should_run_tool_build_step`
const ONLY_HOSTS: bool = true;
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
let builder = run.builder;
run.path($path).default_condition(
builder.config.extended
&& builder.config.tools.as_ref().map_or(
// By default, on nightly/dev enable all tools, else only
// build stable tools.
$stable || builder.build.unstable_features(),
// If `tools` is set, search list for this tool.
|tools| {
tools.iter().any(|tool| match tool.as_ref() {
"clippy" => $tool_name == "clippy-driver",
x => $tool_name == x,
})
}),
should_run_tool_build_step(
run,
$tool_name,
$path,
$stable,
)
}
@ -1067,6 +1058,30 @@ macro_rules! tool_extended {
}
}
fn should_run_tool_build_step<'a>(
run: ShouldRun<'a>,
tool_name: &'static str,
path: &'static str,
stable: bool,
) -> ShouldRun<'a> {
let builder = run.builder;
run.path(path).default_condition(
builder.config.extended
&& builder.config.tools.as_ref().map_or(
// By default, on nightly/dev enable all tools, else only
// build stable tools.
stable || builder.build.unstable_features(),
// If `tools` is set, search list for this tool.
|tools| {
tools.iter().any(|tool| match tool.as_ref() {
"clippy" => tool_name == "clippy-driver",
x => tool_name == x,
})
},
),
)
}
fn run_tool_build_step(
builder: &Builder<'_>,
compiler: Compiler,