Skip to content

Commit 2a9017d

Browse files
committed
Make default check stage be 1, and error out on checking with stage 0
1 parent 076a0a2 commit 2a9017d

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

src/bootstrap/defaults/bootstrap.library.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# These defaults are meant for contributors to the standard library and documentation.
22
[build]
33
bench-stage = 1
4-
check-stage = 1
54
test-stage = 1
65

76
[rust]

src/bootstrap/src/core/config/config.rs

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1022,7 +1022,7 @@ impl Config {
10221022
|| bench_stage.is_some();
10231023

10241024
config.stage = match config.cmd {
1025-
Subcommand::Check { .. } => flags_stage.or(check_stage).unwrap_or(0),
1025+
Subcommand::Check { .. } => flags_stage.or(check_stage).unwrap_or(1),
10261026
Subcommand::Clippy { .. } | Subcommand::Fix => flags_stage.or(check_stage).unwrap_or(1),
10271027
// `download-rustc` only has a speed-up for stage2 builds. Default to stage2 unless explicitly overridden.
10281028
Subcommand::Doc { .. } => {
@@ -1049,9 +1049,16 @@ impl Config {
10491049
};
10501050

10511051
// Now check that the selected stage makes sense, and if not, print a warning and end
1052-
if let (0, Subcommand::Build) = (config.stage, &config.cmd) {
1053-
eprintln!("WARNING: cannot build anything on stage 0. Use at least stage 1.");
1054-
exit!(1);
1052+
match (config.stage, &config.cmd) {
1053+
(0, Subcommand::Build) => {
1054+
eprintln!("WARNING: cannot build anything on stage 0. Use at least stage 1.");
1055+
exit!(1);
1056+
}
1057+
(0, Subcommand::Check { .. }) => {
1058+
eprintln!("WARNING: cannot check anything on stage 0. Use at least stage 1.");
1059+
exit!(1);
1060+
}
1061+
_ => {}
10551062
}
10561063

10571064
// CI should always run stage 2 builds, unless it specifically states otherwise

0 commit comments

Comments
 (0)