Skip to content
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.

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

rename epoch to edition #5274

Merged
merged 1 commit into from
Apr 2, 2018
Merged

rename epoch to edition #5274

merged 1 commit into from
Apr 2, 2018

Conversation

klnusbaum
Copy link
Contributor

Per issue #5214 let's rename all instances of epoch to Edition

@Manishearth
Copy link
Member

r? @alexcrichton

@Manishearth
Copy link
Member

$ cargo fmt -- --write-mode diff
Diff in /home/travis/build/rust-lang/cargo/src/cargo/util/toml/mod.rs at line 14:
 ⏎
 use core::{GitReference, PackageIdSpec, Profiles, SourceId, WorkspaceConfig, WorkspaceRootConfig};⏎
 use core::{Dependency, Manifest, PackageId, Summary, Target};⏎
-use core::{EitherManifest, Edition, Feature, Features, VirtualManifest};⏎
+use core::{Edition, EitherManifest, Feature, Features, VirtualManifest};⏎
 use core::dependency::{Kind, Platform};⏎
 use core::manifest::{LibKind, Lto, ManifestMetadata, Profile};⏎
 use sources::CRATES_IO;⏎

@matklad matklad assigned alexcrichton and unassigned matklad Apr 2, 2018
@alexcrichton
Copy link
Member

@bors: r+

Thanks!

@bors
Copy link
Contributor

bors commented Apr 2, 2018

📌 Commit 3bbe93c has been approved by alexcrichton

bors added a commit that referenced this pull request Apr 2, 2018
rename epoch to edition

Per issue #5214 let's rename all instances of epoch to Edition
@bors
Copy link
Contributor

bors commented Apr 2, 2018

⌛ Testing commit 3bbe93c with merge 551f6f3...

@bors
Copy link
Contributor

bors commented Apr 2, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 551f6f3 to master...

@bors bors merged commit 3bbe93c into rust-lang:master Apr 2, 2018
@klnusbaum klnusbaum deleted the epoch_5214 branch April 22, 2018 17:31
@ehuss ehuss added this to the 1.27.0 milestone Feb 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants