Skip to content

Commit 99c5476

Browse files
committed
remove the outdated incompatibility check
This check is no longer needed as rustdoc ui tests works with any channel + precompiled compiler. Signed-off-by: onur-ozkan <[email protected]>
1 parent e61d3b8 commit 99c5476

File tree

1 file changed

+2
-13
lines changed

1 file changed

+2
-13
lines changed

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

+2-13
Original file line numberDiff line numberDiff line change
@@ -1608,19 +1608,8 @@ impl Config {
16081608
set(&mut config.channel, channel);
16091609

16101610
config.download_rustc_commit = config.download_ci_rustc_commit(download_rustc);
1611-
// This list is incomplete, please help by expanding it!
1612-
if config.download_rustc_commit.is_some() {
1613-
// We need the channel used by the downloaded compiler to match the one we set for rustdoc;
1614-
// otherwise rustdoc-ui tests break.
1615-
if config.channel != ci_channel
1616-
&& !(config.channel == "dev" && ci_channel == "nightly")
1617-
{
1618-
panic!(
1619-
"setting rust.channel={} is incompatible with download-rustc",
1620-
config.channel
1621-
);
1622-
}
1623-
}
1611+
1612+
// FIXME: handle download-rustc incompatible options.
16241613

16251614
debug = debug_toml;
16261615
debug_assertions = debug_assertions_toml;

0 commit comments

Comments
 (0)