File tree 1 file changed +2
-13
lines changed
src/bootstrap/src/core/config
1 file changed +2
-13
lines changed Original file line number Diff line number Diff line change @@ -1608,19 +1608,8 @@ impl Config {
1608
1608
set ( & mut config. channel , channel) ;
1609
1609
1610
1610
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.
1624
1613
1625
1614
debug = debug_toml;
1626
1615
debug_assertions = debug_assertions_toml;
You can’t perform that action at this time.
0 commit comments