about summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-05-11 07:28:51 +0000
committerbors <bors@rust-lang.org>2018-05-11 07:28:51 +0000
commit41707d8df9a441e19387a4a61415ee0af58a9e48 (patch)
tree2ed180b5138abe18c209413e65393f8190273f14 /src/libsyntax
parent6923fb512aaf0af8fcfc7e5e60c05e6cf6c92cbe (diff)
parentd636aec3514874274f2acc8a6897c451ac380d1f (diff)
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
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/edition.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/edition.rs b/src/libsyntax/edition.rs
index 7341941c242..c98b54581f3 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",
         }
     }