change all appropriate EPOCH to EDITION

frewsxcv · Mar 20, 2018 · 11f1406 · 11f1406
1 parent 3c8d555
commit 11f1406
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/librustc/lint/context.rs b/src/librustc/lint/context.rs
@@ -201,7 +201,7 @@ impl LintStore {
                                         sess: Option<&Session>,
                                         lints: Vec<FutureIncompatibleInfo>) {
 
-        for edition in edition::ALL_EPOCHS {
+        for edition in edition::ALL_EDITIONS {
             let lints = lints.iter().filter(|f| f.edition == Some(*edition)).map(|f| f.id)
                              .collect::<Vec<_>>();
             if !lints.is_empty() {

diff --git a/src/libsyntax/edition.rs b/src/libsyntax/edition.rs
@@ -36,7 +36,7 @@ pub enum Edition {
 }
 
 // must be in order from oldest to newest
-pub const ALL_EPOCHS: &[Edition] = &[Edition::Edition2015, Edition::Edition2018];
+pub const ALL_EDITIONS: &[Edition] = &[Edition::Edition2015, Edition::Edition2018];
 
 impl fmt::Display for Edition {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {