Skip to content

Commit 6dc1dea

Browse files
committed
Auto merge of #12429 - Nilstrieb:we-love-internal-features, r=weihanglo
`#[allow(internal_features)]` in RUSTC_BOOTSTRAP test This will be required in the future (where "the future" is rust-lang/rust#108955 which fails CI because of cargo here). This does emit the unknown lints lint right now but that doesn't matter as it's just warn-by-default - internal_features is deny-by-default though, so it causes errors.
2 parents 6145d0c + b272053 commit 6dc1dea

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

tests/testsuite/build_script_env.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,10 @@ fn rustc_bootstrap() {
117117
"#;
118118
let p = project()
119119
.file("Cargo.toml", &basic_manifest("has-dashes", "0.0.1"))
120-
.file("src/lib.rs", "#![feature(rustc_attrs)]")
120+
.file(
121+
"src/lib.rs",
122+
"#![allow(internal_features)] #![feature(rustc_attrs)]",
123+
)
121124
.file("build.rs", build_rs)
122125
.build();
123126
// RUSTC_BOOTSTRAP unset on stable should error
@@ -154,7 +157,10 @@ fn rustc_bootstrap() {
154157
// Tests for binaries instead of libraries
155158
let p = project()
156159
.file("Cargo.toml", &basic_manifest("foo", "0.0.1"))
157-
.file("src/main.rs", "#![feature(rustc_attrs)] fn main() {}")
160+
.file(
161+
"src/main.rs",
162+
"#![allow(internal_features)] #![feature(rustc_attrs)] fn main() {}",
163+
)
158164
.file("build.rs", build_rs)
159165
.build();
160166
// nightly should warn when there's no library whether or not RUSTC_BOOTSTRAP is set

0 commit comments

Comments
 (0)