Add -Zfix-edition
#15596
Draft
Add -Zfix-edition
#15596
+523
−95
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This adds support for the "future" edition which was added to rustc in rust-lang/rust#137606. To enable support for unstable editions, this introduces a new `unstable-edition` cargo feature. The intent is that instead of having a new feature for each edition that we reuse this feature for all new editions. I don't see a particular reason we should have a separate one for each edition, and this helps a bit with scalability and simplifies some of the edition process. This also includes a change to rework `supports_compat_lint` explained in the comment.
This factors out the code to reload a workspace since I will be needing to reuse this elsewhere. There is some risk with this method not getting updated correctly in the future as new fields are added to Workspace (and it may be missing some things now), but that is an issue with the existing code.
This adds support for parsing the `-Zfix-edition` flag.
This adds the `EditionFixMode` enum to control the behavior of `cargo fix --edition`. The main intent is to provide a way to force `cargo fix` to migrate to a specific edition, instead of just going to the "next". This will be needed for `-Zfix-edition` in order to force it to use the "future" edition, which is never the "next" edition. This requires being able to serialize and deserialize this setting as it is conveyed through an environment variable to the recursive cargo invocation.
rustbot
added
A-cli
ehuss
force-pushed
the
fix-edition
branch
2 times, most recently
from
08b0aa2 to
9617f3b
Compare
rustbot
added
the
A-infrastructure
traviscross
reviewed
May 25, 2025
| [package] | ||
| name = "foo" | ||
| edition = "future" | ||
|
|
There was a problem hiding this comment.
Suggested change
I can't tell, is the trailing whitespace on this line intended?
There was a problem hiding this comment.
Yes, it's just an artifact of how the str! macro works (which handles automatic updates). There isn't a blank line here.
There was a problem hiding this comment.
It may be the same answer, but just in case it was ambiguous, what stood out here wasn't the blank line, but that (unlike the blank lines above) the line contains 12 space characters ( ).
This adds the implementation for the behavior of `cargo fix -Zfix-edition`.
|
☔ The latest upstream changes (possibly f19321e) made this pull request unmergeable. Please resolve the merge conflicts. |
rustbot
added
the
S-waiting-on-author
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This adds a new
cargo fix -Zfix-editionpermanently unstable flag to assist with edition migration testing, particularly with crater.The commits and given documentation should explain how it works, but there will be forthcoming edition documentation (on the forge) once all the pieces with crater come together.
Warning
Draft as this is stacked on top of #15595