Skip to content

Commit eedafbc

Browse files
committed
remove deprecated option parallel-compiler
Signed-off-by: onur-ozkan <work@onurozkan.dev>
1 parent 47cd3e7 commit eedafbc

File tree

2 files changed

+5
-10
lines changed

2 files changed

+5
-10
lines changed

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

-10
Original file line numberDiff line numberDiff line change
@@ -1154,7 +1154,6 @@ define_config! {
11541154
debuginfo_level_tests: Option<DebuginfoLevel> = "debuginfo-level-tests",
11551155
backtrace: Option<bool> = "backtrace",
11561156
incremental: Option<bool> = "incremental",
1157-
parallel_compiler: Option<bool> = "parallel-compiler",
11581157
default_linker: Option<String> = "default-linker",
11591158
channel: Option<String> = "channel",
11601159
description: Option<String> = "description",
@@ -1764,7 +1763,6 @@ impl Config {
17641763
debuginfo_level_tests: debuginfo_level_tests_toml,
17651764
backtrace,
17661765
incremental,
1767-
parallel_compiler,
17681766
randomize_layout,
17691767
default_linker,
17701768
channel: _, // already handled above
@@ -1874,13 +1872,6 @@ impl Config {
18741872
config.rust_randomize_layout = randomize_layout.unwrap_or_default();
18751873
config.llvm_tools_enabled = llvm_tools.unwrap_or(true);
18761874

1877-
// FIXME: Remove this option at the end of 2024.
1878-
if parallel_compiler.is_some() {
1879-
println!(
1880-
"WARNING: The `rust.parallel-compiler` option is deprecated and does nothing. The parallel compiler (with one thread) is now the default"
1881-
);
1882-
}
1883-
18841875
config.llvm_enzyme =
18851876
llvm_enzyme.unwrap_or(config.channel == "dev" || config.channel == "nightly");
18861877
config.rustc_default_linker = default_linker;
@@ -3222,7 +3213,6 @@ fn check_incompatible_options_for_ci_rustc(
32223213
debuginfo_level_tools: _,
32233214
debuginfo_level_tests: _,
32243215
backtrace: _,
3225-
parallel_compiler: _,
32263216
musl_root: _,
32273217
verbose_tests: _,
32283218
optimize_tests: _,

src/bootstrap/src/utils/change_tracker.rs

+5
Original file line numberDiff line numberDiff line change
@@ -320,4 +320,9 @@ pub const CONFIG_CHANGE_HISTORY: &[ChangeInfo] = &[
320320
severity: ChangeSeverity::Warning,
321321
summary: "compiletest now takes `--no-capture` instead of `--nocapture`; bootstrap now accepts `--no-capture` as an argument to test commands directly",
322322
},
323+
ChangeInfo {
324+
change_id: 134650,
325+
severity: ChangeSeverity::Warning,
326+
summary: "Removed `rust.parallel-compiler` as it was deprecated in #132282 long time ago.",
327+
},
323328
];

0 commit comments

Comments
 (0)