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.

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

Jump to bottom

feat: Add Edition2024 #12771

Merged
merged 1 commit into from
Oct 4, 2023
Merged

feat: Add Edition2024 #12771

merged 1 commit into from
Oct 4, 2023

Conversation

Muscraft
Copy link
Member

@Muscraft Muscraft commented Oct 4, 2023 •
edited by epage
Loading

RFC for Edition2024. While the RFC is not yet merged, this follows rustc which added the 2024 edition previously in rust-lang/rust#94461

This PR adds Edition2024 as a possible value for edition = "xxxx". I did this by following the guide here.

@rustbot
Copy link
Collaborator

rustbot commented Oct 4, 2023

r? @weihanglo

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added A-cli-help Area: built-in command-line help A-documenting-cargo-itself Area: Cargo's documentation A-manifest Area: Cargo.toml issues A-unstable Area: nightly unstable support S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 4, 2023
Muscraft
Muscraft commented Oct 4, 2023
View reviewed changes
src/doc/src/reference/unstable.md
@@ -1271,6 +1272,32 @@ Differences between `cargo run --manifest-path <path>` and `cargo <path>`

### Documentation Updates

## Edition 2024
* Tracking Issue: (none created yet)
Copy link
Member Author

Choose a reason for hiding this comment

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

No tracking issue has been created yet, so this will have to be updated to include a link when the RFC gets merged and a tracking issue gets created.

If there is a tracking issue for cargo and rust, both links should probably be included.

Muscraft
Muscraft commented Oct 4, 2023
View reviewed changes
src/cargo/core/features.rs
@@ -286,6 +292,7 @@ impl Edition {
Edition2015 => false,
Edition2018 => true,
Edition2021 => true,
Edition2024 => false,
Copy link
Member Author

Choose a reason for hiding this comment

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

While there currently is rust_2024_compatibility lint group, I set it to false as there are no lints in the group currently (from what I can tell). This was how Edition2021 originally was before it was updated to be true.

@epage
Copy link
Contributor

epage commented Oct 4, 2023

@bors r+

@bors
Copy link
Contributor

bors commented Oct 4, 2023

📌 Commit b3481b7 has been approved by epage

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 4, 2023
@bors
Copy link
Contributor

bors commented Oct 4, 2023

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout edition-2024 (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self edition-2024 --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message 
Auto-merging src/cargo/util/toml/mod.rs
CONFLICT (content): Merge conflict in src/cargo/util/toml/mod.rs
Automatic merge failed; fix conflicts and then commit the result.

@bors bors added S-waiting-on-author Status: The marked PR is awaiting some action (such as code changes) from the PR author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 4, 2023
@epage
Copy link
Contributor

epage commented Oct 4, 2023

@bors r+

@bors
Copy link
Contributor

bors commented Oct 4, 2023

📌 Commit b2b3cfa has been approved by epage

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: The marked PR is awaiting some action (such as code changes) from the PR author. labels Oct 4, 2023
@bors
Copy link
Contributor

bors commented Oct 4, 2023

⌛ Testing commit b2b3cfa with merge d74bc47...

@bors
Copy link
Contributor

bors commented Oct 4, 2023

☀️ Test successful - checks-actions
Approved by: epage
Pushing d74bc47 to master...

@bors bors merged commit d74bc47 into rust-lang:master Oct 4, 2023
19 checks passed
@Muscraft Muscraft deleted the edition-2024 branch October 4, 2023 20:10
@ehuss ehuss added this to the 1.75.0 milestone Oct 11, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@epage epage epage approved these changes

Assignees

@weihanglo weihanglo

Labels
A-cli-help Area: built-in command-line help A-documenting-cargo-itself Area: Cargo's documentation A-manifest Area: Cargo.toml issues A-unstable Area: nightly unstable support S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.75.0
Development

Successfully merging this pull request may close these issues.
6 participants
@Muscraft @rustbot @epage @bors @ehuss @weihanglo