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

Migrate to edition 2021 #10607

Merged
merged 1 commit into from
Oct 21, 2021
Merged

Migrate to edition 2021 #10607

merged 1 commit into from
Oct 21, 2021

Conversation

Veykril
Copy link
Member

@Veykril Veykril commented Oct 21, 2021

No description provided.

@lnicola
Copy link
Member

lnicola commented Oct 21, 2021

error: the item `TryFrom` is imported redundantly
   --> crates\vfs\src\vfs_path.rs:270:13

@kjeremy
Copy link
Contributor

kjeremy commented Oct 21, 2021

Did you run cargo fix on this?

@@ -8,7 +8,7 @@ use xshell::{cmd, pushd};
use crate::flags;

// Latest stable, feel free to send a PR if this lags behind.
const REQUIRED_RUST_VERSION: u32 = 55;
const REQUIRED_RUST_VERSION: u32 = 56;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we enforce this with the new [package] rust-version going forward?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could though if I see this right we don't fail on a version mismatch, we just print an error and continue.

@Veykril
Copy link
Member Author

Veykril commented Oct 21, 2021

I did run cargo fix --edition but that didn't change anything after migrating.

@Veykril
Copy link
Member Author

Veykril commented Oct 21, 2021

bors r+

@bors
Copy link
Contributor

bors bot commented Oct 21, 2021

@bors bors bot merged commit 56fbf5d into rust-lang:master Oct 21, 2021
@Veykril Veykril deleted the ed2021 branch October 21, 2021 18:40
@@ -350,7 +350,7 @@ fn test_format_document_2018() {
[package]
name = "foo"
version = "0.0.0"
edition = "2018"
edition = "2021"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't matter, but this test was written specifically for 2018 (test_format_document_2018).

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh ye, we should revert that still

bors bot added a commit that referenced this pull request Oct 24, 2021
10624: minor: revert edition change in test r=lnicola a=lnicola

Fixes #10607 (comment)

Co-authored-by: Laurențiu Nicola <lnicola@dend.ro>
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.

None yet

3 participants