Skip to content

Commit 0cee03d

Browse files
authored
Rollup merge of #102178 - RalfJung:bootstrap-backtrace, r=Mark-Simulacrum
bootstrap: the backtrace feature is stable, no need to allow it any more
2 parents 0adf293 + c8d346e commit 0cee03d

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

src/bootstrap/builder.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1557,13 +1557,12 @@ impl<'a> Builder<'a> {
15571557
match mode {
15581558
Mode::ToolBootstrap => {
15591559
// Restrict the allowed features to those passed by rustbuild, so we don't depend on nightly accidentally.
1560-
// HACK: because anyhow does feature detection in build.rs, we need to allow the backtrace feature too.
1561-
rustflags.arg("-Zallow-features=binary-dep-depinfo,backtrace");
1560+
rustflags.arg("-Zallow-features=binary-dep-depinfo");
15621561
}
15631562
Mode::ToolStd => {
15641563
// Right now this is just compiletest and a few other tools that build on stable.
15651564
// Allow them to use `feature(test)`, but nothing else.
1566-
rustflags.arg("-Zallow-features=binary-dep-depinfo,test,backtrace,proc_macro_internals,proc_macro_diagnostic,proc_macro_span");
1565+
rustflags.arg("-Zallow-features=binary-dep-depinfo,test,proc_macro_internals,proc_macro_diagnostic,proc_macro_span");
15671566
}
15681567
Mode::Std | Mode::Rustc | Mode::Codegen | Mode::ToolRustc => {}
15691568
}

0 commit comments

Comments
 (0)