Skip to content

Commit 9e1ee5e

Browse files
authored
Rollup merge of #159878 - Zalathar:stage0-libtest, r=Kobzol
bootstrap: Remove obsolete option `build.compiletest-use-stage0-libtest` During the bootstrap stage0 redesign, `compiletest-use-stage0-libtest` was needed as a workaround for big regressions in compiletest build times, due to compiletest's dependency on libtest or `#![feature(internal_output_capture)]`. As of #146929, compiletest has no dependency on libtest or any unstable features, and is always built with the stage0 compiler. Since then, `compiletest-use-stage0-libtest` has had no effect, and was retained only to avoid breaking people's builds if they had that option set. Several months later, it should be fine to remove the option entirely. r? jieyouxu (or bootstrap)
2 parents 08eec7a + baa03e9 commit 9e1ee5e

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -533,8 +533,6 @@ impl Config {
533533
optimized_compiler_builtins: build_optimized_compiler_builtins,
534534
jobs: build_jobs,
535535
compiletest_diff_tool: build_compiletest_diff_tool,
536-
// No longer has any effect; kept (for now) to avoid breaking people's configs.
537-
compiletest_use_stage0_libtest: _,
538536
tidy_extra_checks: build_tidy_extra_checks,
539537
ccache: build_ccache,
540538
exclude: build_exclude,

src/bootstrap/src/core/config/toml/build.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,6 @@ define_config! {
7272
jobs: Option<u32> = "jobs",
7373
compiletest_diff_tool: Option<String> = "compiletest-diff-tool",
7474
compiletest_allow_stage0: Option<bool> = "compiletest-allow-stage0",
75-
/// No longer has any effect; kept (for now) to avoid breaking people's configs.
76-
/// FIXME(#146929): Remove this in 2026.
77-
compiletest_use_stage0_libtest: Option<bool> = "compiletest-use-stage0-libtest",
7875
tidy_extra_checks: Option<String> = "tidy-extra-checks",
7976
ccache: Option<StringOrBool> = "ccache",
8077
exclude: Option<Vec<PathBuf>> = "exclude",

src/bootstrap/src/utils/change_tracker.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -656,4 +656,9 @@ pub const CONFIG_CHANGE_HISTORY: &[ChangeInfo] = &[
656656
severity: ChangeSeverity::Warning,
657657
summary: "GDB and LLDB are no longer automatically discovered from the environment. If you want to use path discovery for them, you can opt in using `build.gdb = \"discover\"` or `build.lldb = \"discover\"`.",
658658
},
659+
ChangeInfo {
660+
change_id: 159878,
661+
severity: ChangeSeverity::Warning,
662+
summary: "Obsolete option `build.compiletest-use-stage0-libtest` has no effect and has been removed.",
663+
},
659664
];

0 commit comments

Comments
 (0)