diff options
| author | Kurtis Nusbaum <kcommiter@gmail.com> | 2018-03-14 20:56:13 -0700 |
|---|---|---|
| committer | Kurtis Nusbaum <kcommiter@gmail.com> | 2018-03-20 10:27:02 -0700 |
| commit | 11f14060a4da7776c5f56e7dc53cc9545e4ab25f (patch) | |
| tree | b46143d38f0e985a8e36aedf5534da26e8e952e1 | |
| parent | 3c8d55549728ec117fb6e3de93ce3d96fb6622d4 (diff) | |
change all appropriate EPOCH to EDITION
| -rw-r--r-- | src/librustc/lint/context.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/edition.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc/lint/context.rs b/src/librustc/lint/context.rs index 936aa71f16c..3c833251f72 100644 --- 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 index 12ac6410ce1..61246d4493c 100644 --- 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 { |