Skip to content

Commit

Permalink
Auto merge of #97410 - jyn514:tool-std-features, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
Only allow `compiletest` to use `feature(test)`, not any other feature

Using language features occasionally causes issues when using nightly to bootstrap, rather than beta.
See #59264 for additional context.
  • Loading branch information
bors committed May 26, 2022
2 parents 99c4758 + e71c48c commit 8bf9c20
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion src/bootstrap/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1232,7 +1232,12 @@ impl<'a> Builder<'a> {
// HACK: because anyhow does feature detection in build.rs, we need to allow the backtrace feature too.
rustflags.arg("-Zallow-features=binary-dep-depinfo,backtrace");
}
Mode::Std | Mode::Rustc | Mode::ToolStd | Mode::Codegen | Mode::ToolRustc => {}
Mode::ToolStd => {
// Right now this is just compiletest and a few other tools that build on stable.
// Allow them to use `feature(test)`, but nothing else.
rustflags.arg("-Zallow-features=binary-dep-depinfo,test,backtrace");
}
Mode::Std | Mode::Rustc | Mode::Codegen | Mode::ToolRustc => {}
}

cargo.arg("-j").arg(self.jobs().to_string());
Expand Down

0 comments on commit 8bf9c20

Please sign in to comment.