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
This commit is contained in:
bors 2018-05-11 07:28:51 +00:00
commit 41707d8df9
2 changed files with 3 additions and 3 deletions

View file

@ -179,7 +179,7 @@ pub fn register_builtins(store: &mut lint::LintStore, sess: Option<&Session>) {
UNUSED_PARENS); UNUSED_PARENS);
add_lint_group!(sess, add_lint_group!(sess,
"rust_2018_migration", "rust_2018_idioms",
BARE_TRAIT_OBJECT, BARE_TRAIT_OBJECT,
UNREACHABLE_PUB, UNREACHABLE_PUB,
UNNECESSARY_EXTERN_CRATE); UNNECESSARY_EXTERN_CRATE);

View file

@ -50,8 +50,8 @@ impl fmt::Display for Edition {
impl Edition { impl Edition {
pub fn lint_name(&self) -> &'static str { pub fn lint_name(&self) -> &'static str {
match *self { match *self {
Edition::Edition2015 => "rust_2015_breakage", Edition::Edition2015 => "rust_2015_compatibility",
Edition::Edition2018 => "rust_2018_breakage", Edition::Edition2018 => "rust_2018_compatibility",
} }
} }