rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

change all appropriate EPOCH to EDITION

Browse Source
This commit is contained in:
Kurtis Nusbaum
2018-03-14 20:56:13 -07:00
parent 3c8d555497
commit 11f14060a4
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/librustc/lint/context.rs
View File

@@ -201,7 +201,7 @@ impl LintStore {
sess: Option<&Session>, sess: Option<&Session>,
lints: Vec<FutureIncompatibleInfo>) { 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) let lints = lints.iter().filter(|f| f.edition == Some(*edition)).map(|f| f.id)
.collect::<Vec<_>>(); .collect::<Vec<_>>();
if !lints.is_empty() { if !lints.is_empty() {

2
src/libsyntax/edition.rs
View File

@@ -36,7 +36,7 @@ pub enum Edition {
} }
// must be in order from oldest to newest // 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 { impl fmt::Display for Edition {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {