about summary refs log tree commit diff
diff options
context:
space:
mode:
authoronur-ozkan <work@onurozkan.dev>2024-06-08 12:59:58 +0300
committeronur-ozkan <work@onurozkan.dev>2024-06-09 22:49:32 +0300
commit99c5476edb85f061d960b4c789b4f70ec444864d (patch)
tree55a8b90ea9e45dae26d9dffed9b2c5fe4ff713c2
parente61d3b8372f988ba8b6573deac2290d59d72b76f (diff)
downloadrust-99c5476edb85f061d960b4c789b4f70ec444864d.tar.gz
rust-99c5476edb85f061d960b4c789b4f70ec444864d.zip
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 <work@onurozkan.dev>
-rw-r--r--src/bootstrap/src/core/config/config.rs15
1 files changed, 2 insertions, 13 deletions
diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs
index 2d87fb4aa60..36b44d0169c 100644
--- a/src/bootstrap/src/core/config/config.rs
+++ b/src/bootstrap/src/core/config/config.rs
@@ -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;