Skip to content

Commit 34f393c

Browse files
authored
Rollup merge of rust-lang#86717 - rylev:rename, r=nikomatsakis
Rename some Rust 2021 lints to better names Based on conversation in rust-lang#85894. Rename a bunch of Rust 2021 related lints: Lints that are officially renamed because they are already in beta or stable: * `disjoint_capture_migration` => `rust_2021_incompatible_closure_captures` * `or_patterns_back_compat` => `rust_2021_incompatible_or_patterns` * `non_fmt_panic` => `non_fmt_panics` Lints that are renamed but don't require any back -compat work since they aren't yet in stable: * `future_prelude_collision` => `rust_2021_prelude_collisions` * `reserved_prefix` => `rust_2021_token_prefixes` Lints that have been discussed but that I did not rename: * ~`non_fmt_panic` and `bare_trait_object`: is making this plural worth the headache we might cause users?~ * `array_into_iter`: I'm unsure of a good name and whether bothering users with a name change is worth it. r? `@nikomatsakis`
2 parents a106833 + fd4a996 commit 34f393c

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

core/src/lib.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,8 @@
164164
#![feature(no_niche)] // rust-lang/rust#68303
165165
#![feature(no_coverage)] // rust-lang/rust#84605
166166
#![deny(unsafe_op_in_unsafe_fn)]
167-
#![deny(or_patterns_back_compat)]
167+
#![cfg_attr(bootstrap, deny(or_patterns_back_compat))]
168+
#![cfg_attr(not(bootstrap), deny(rust_2021_incompatible_or_patterns))]
168169

169170
// allow using `core::` in intra-doc links
170171
#[allow(unused_extern_crates)]

0 commit comments

Comments
 (0)