Skip to content

Commit 41707d8

Browse files
committed
Auto merge of #50620 - alexcrichton:change-names-again, r=nikomatsakis
Rename the 2018 edition lint names * `rust_2018_breakage` -> `rust_2018_compatibility` - the lint for ensuring that your code, in the 2015 edition, is compatible with the 2018 edition's semantics. This is required to pass *before* you enable the 2018 edition. * `rust_2018_migration` -> `rust_2018_idioms` - the lint for writing idiomatic code after you've already enabled the 2018 edition
2 parents 6923fb5 + d636aec commit 41707d8

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/librustc_lint/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ pub fn register_builtins(store: &mut lint::LintStore, sess: Option<&Session>) {
179179
UNUSED_PARENS);
180180

181181
add_lint_group!(sess,
182-
"rust_2018_migration",
182+
"rust_2018_idioms",
183183
BARE_TRAIT_OBJECT,
184184
UNREACHABLE_PUB,
185185
UNNECESSARY_EXTERN_CRATE);

src/libsyntax/edition.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ impl fmt::Display for Edition {
5050
impl Edition {
5151
pub fn lint_name(&self) -> &'static str {
5252
match *self {
53-
Edition::Edition2015 => "rust_2015_breakage",
54-
Edition::Edition2018 => "rust_2018_breakage",
53+
Edition::Edition2015 => "rust_2015_compatibility",
54+
Edition::Edition2018 => "rust_2018_compatibility",
5555
}
5656
}
5757

0 commit comments

Comments
 (0)