Skip to content

Commit

Permalink
remove the outdated incompatibility check
Browse files Browse the repository at this point in the history
This check is no longer needed as rustdoc ui tests works with any
channel + precompiled compiler.

Signed-off-by: onur-ozkan <work@onurozkan.dev>
  • Loading branch information
onur-ozkan committed Jun 9, 2024
1 parent e61d3b8 commit 99c5476
Showing 1 changed file with 2 additions and 13 deletions.
15 changes: 2 additions & 13 deletions src/bootstrap/src/core/config/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1608,19 +1608,8 @@ impl Config {
set(&mut config.channel, channel);

config.download_rustc_commit = config.download_ci_rustc_commit(download_rustc);
// This list is incomplete, please help by expanding it!
if config.download_rustc_commit.is_some() {
// We need the channel used by the downloaded compiler to match the one we set for rustdoc;
// otherwise rustdoc-ui tests break.
if config.channel != ci_channel
&& !(config.channel == "dev" && ci_channel == "nightly")
{
panic!(
"setting rust.channel={} is incompatible with download-rustc",
config.channel
);
}
}

// FIXME: handle download-rustc incompatible options.

debug = debug_toml;
debug_assertions = debug_assertions_toml;
Expand Down

0 comments on commit 99c5476

Please sign in to comment.