Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 5 pull requests #114492

Merged
merged 17 commits into from
Aug 5, 2023
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix ui-fulldeps missing the internal_features lint on stage 0
  • Loading branch information
compiler-errors committed Aug 4, 2023
commit f78485a97ecea3327e212275a32bd987267cbdc8
9 changes: 7 additions & 2 deletions src/tools/compiletest/src/runtest.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2466,8 +2466,13 @@ impl<'test> TestCx<'test> {
rustc.args(&["-A", "unused"]);
}

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

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