Skip to content

Commit 403bc5b

Browse files
committed
Auto merge of #14352 - Urgau:fix-cfgs-lint-name, r=weihanglo
Fix renamed disallowed cfg lint name ### What does this PR try to resolve? In #14153 we allowed the to be merged rust-lang/rust#126158 lint. Since then an FCP was conducted and the lint was renamed to `explicit_builtin_cfgs_in_flags`. This PR renames the lint in the same test so that rust-lang/rust#126158 can be merged. ### Additional information rust-lang/rust#126158 (comment) shows the failing test.
2 parents 2cd657c + e03f2db commit 403bc5b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

tests/testsuite/build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6575,7 +6575,7 @@ fn user_specific_cfgs_are_filtered_out() {
65756575
)
65766576
.build();
65776577

6578-
p.cargo("rustc -- --cfg debug_assertions --cfg proc_macro -Aunknown_lints -Aunexpected_builtin_cfgs")
6578+
p.cargo("rustc -- --cfg debug_assertions --cfg proc_macro -Aunknown_lints -Aexplicit_builtin_cfgs_in_flags")
65796579
.run();
65806580
p.process(&p.bin("foo")).run();
65816581
}

0 commit comments

Comments
 (0)