Skip to content

rename epoch to edition #49035

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 23, 2018
Merged

rename epoch to edition #49035

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c8d555
rename epoch to edition
klnusbaum Mar 15, 2018
11f1406
change all appropriate EPOCH to EDITION
klnusbaum Mar 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
change all appropriate EPOCH to EDITION
  • Loading branch information
@klnusbaum
klnusbaum committed Mar 20, 2018
commit 11f14060a4da7776c5f56e7dc53cc9545e4ab25f
2 changes: 1 addition & 1 deletion src/librustc/lint/context.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion src/libsyntax/edition.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down