From d636aec3514874274f2acc8a6897c451ac380d1f Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 10 May 2018 11:28:11 -0700 Subject: [PATCH] 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 --- src/librustc_lint/lib.rs | 2 +- src/libsyntax/edition.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/librustc_lint/lib.rs b/src/librustc_lint/lib.rs index 4403e1e3358b2..39f550a4b459a 100644 --- a/src/librustc_lint/lib.rs +++ b/src/librustc_lint/lib.rs @@ -179,7 +179,7 @@ pub fn register_builtins(store: &mut lint::LintStore, sess: Option<&Session>) { UNUSED_PARENS); add_lint_group!(sess, - "rust_2018_migration", + "rust_2018_idioms", BARE_TRAIT_OBJECT, UNREACHABLE_PUB, UNNECESSARY_EXTERN_CRATE); diff --git a/src/libsyntax/edition.rs b/src/libsyntax/edition.rs index 7341941c242a4..c98b54581f35f 100644 --- a/src/libsyntax/edition.rs +++ b/src/libsyntax/edition.rs @@ -50,8 +50,8 @@ impl fmt::Display for Edition { impl Edition { pub fn lint_name(&self) -> &'static str { match *self { - Edition::Edition2015 => "rust_2015_breakage", - Edition::Edition2018 => "rust_2018_breakage", + Edition::Edition2015 => "rust_2015_compatibility", + Edition::Edition2018 => "rust_2018_compatibility", } }