Skip to content

Commit 200fa5d

Browse files
Rollup merge of rust-lang#114482 - compiler-errors:sigh, r=pnkfelix
Fix ui-fulldeps missing the `internal_features` lint on stage 0 Similar to rust-lang#114102, `ui-fulldeps --stage=1` builds using the the stage 0 compiler instead of the stage 1 compiler. That means that the new `internal_features` lint is referencing a lint that does not exist. Gate the flag it properly until the next feature bump. Maybe we should just add ui-fulldeps stage 1 into CI somewhere so this is flagged before landing.
2 parents a7f0900 + f78485a commit 200fa5d

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

src/tools/compiletest/src/runtest.rs

+7-2
Original file line numberDiff line numberDiff line change
@@ -2466,8 +2466,13 @@ impl<'test> TestCx<'test> {
24662466
rustc.args(&["-A", "unused"]);
24672467
}
24682468

2469-
// Allow tests to use internal features.
2470-
rustc.args(&["-A", "internal_features"]);
2469+
// #[cfg(not(bootstrap)] unconditionally pass flag after beta bump
2470+
// since `ui-fulldeps --stage=1` builds using the stage 0 compiler,
2471+
// which doesn't have this lint.
2472+
if !(self.config.stage_id.starts_with("stage1-") && self.config.suite == "ui-fulldeps") {
2473+
// Allow tests to use internal features.
2474+
rustc.args(&["-A", "internal_features"]);
2475+
}
24712476

24722477
if self.props.force_host {
24732478
self.maybe_add_external_args(&mut rustc, &self.config.host_rustcflags);

0 commit comments

Comments
 (0)