Skip to content

Commit e80be0b

Browse files
authored
Rollup merge of #142364 - Kobzol:download-ci-incremental-warning-remove, r=RalfJung
Do not warn on `rust.incremental` when using download CI rustc Discussed on Zulip. r? `@RalfJung`
2 parents e78b619 + 796ee4f commit e80be0b

File tree

1 file changed

+1
-2
lines changed
  • src/bootstrap/src/core/config/toml

1 file changed

+1
-2
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,11 +321,11 @@ pub fn check_incompatible_options_for_ci_rustc(
321321
rpath,
322322
channel,
323323
description,
324-
incremental,
325324
default_linker,
326325
std_features,
327326

328327
// Rest of the options can simply be ignored.
328+
incremental: _,
329329
debug: _,
330330
codegen_units: _,
331331
codegen_units_std: _,
@@ -389,7 +389,6 @@ pub fn check_incompatible_options_for_ci_rustc(
389389

390390
warn!(current_rust_config.channel, channel, "rust");
391391
warn!(current_rust_config.description, description, "rust");
392-
warn!(current_rust_config.incremental, incremental, "rust");
393392

394393
Ok(())
395394
}

0 commit comments

Comments
 (0)