rustfmt: drop nightly-gating of the --style-edition flag registration
#135200
Conversation
This file contains 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
rustbot
added
the
S-waiting-on-review
|
Some changes occurred in src/tools/rustfmt cc @rust-lang/rustfmt |
|
cc @ytmimi, since you reviewed the original PR: does this look right to you? |
jieyouxu
commented
Jan 7, 2025
| opts.optopt( | ||
| "", | ||
| "style-edition", | ||
| "The edition of the Style Guide.", |
There was a problem hiding this comment.
I also dropped the (Unstable) in the description
|
Er, I guess this will have to be beta backported in order to unblock the beta release? |
|
💀 |
|
Anyways, LGTM. |
ytmimi
approved these changes
Jan 7, 2025
|
It's very easy to miss :) No worries! |
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jan 7, 2025
…r=ytmimi,compiler-errors rustfmt: drop nightly-gating of the `--style-edition` flag registration Follow-up to [Stabilize `style_edition = "2024"` in-tree rust-lang#134929](rust-lang#134929). rust-lang#134929 un-nightly-gated the *read* of `--style-edition`, but didn't also un-nightly-gate the *registration*/*declaration* of the `--style-edition` flag itself. Reading `--style-edition` on a non-nightly channel (e.g. beta) will thus panic because `--style-edition` is never declared. This PR also un-nightly-gates the registration. Not sure how to write a regression test for this, because this *requires* the non-nightly / beta channel. Though existing tests do fail (albeit indirectly). Checking if this fixes the panic against beta in rust-lang#135197. r? rustfmt
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 7, 2025
…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#131146 (Stop clearing box's drop flags early) - rust-lang#133810 (remove unnecessary `eval_verify_bound`) - rust-lang#134745 (Normalize each signature input/output in `typeck_with_fallback` with its own span) - rust-lang#134989 (Lower Guard Patterns to HIR.) - rust-lang#135149 (Use a post-monomorphization typing env when mangling components that come from impls) - rust-lang#135171 (rustdoc: use stable paths as preferred canonical paths) - rust-lang#135200 (rustfmt: drop nightly-gating of the `--style-edition` flag registration) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 7, 2025
…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#133810 (remove unnecessary `eval_verify_bound`) - rust-lang#134745 (Normalize each signature input/output in `typeck_with_fallback` with its own span) - rust-lang#134989 (Lower Guard Patterns to HIR.) - rust-lang#135149 (Use a post-monomorphization typing env when mangling components that come from impls) - rust-lang#135171 (rustdoc: use stable paths as preferred canonical paths) - rust-lang#135200 (rustfmt: drop nightly-gating of the `--style-edition` flag registration) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 8, 2025
Rollup merge of rust-lang#135200 - jieyouxu:stabilize-style-edition, r=ytmimi,compiler-errors rustfmt: drop nightly-gating of the `--style-edition` flag registration Follow-up to [Stabilize `style_edition = "2024"` in-tree rust-lang#134929](rust-lang#134929). rust-lang#134929 un-nightly-gated the *read* of `--style-edition`, but didn't also un-nightly-gate the *registration*/*declaration* of the `--style-edition` flag itself. Reading `--style-edition` on a non-nightly channel (e.g. beta) will thus panic because `--style-edition` is never declared. This PR also un-nightly-gates the registration. Not sure how to write a regression test for this, because this *requires* the non-nightly / beta channel. Though existing tests do fail (albeit indirectly). Checking if this fixes the panic against beta in rust-lang#135197. r? rustfmt
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.
Follow-up to Stabilize
style_edition = "2024"in-tree #134929.#134929 un-nightly-gated the read of
--style-edition, but didn't also un-nightly-gate the registration/declaration of the--style-editionflag itself. Reading--style-editionon a non-nightly channel (e.g. beta) will thus panic because--style-editionis never declared.This PR also un-nightly-gates the registration. Not sure how to write a regression test for this, because this requires the non-nightly / beta channel. Though existing tests do fail (albeit indirectly).
Checking if this fixes the panic against beta in #135197.
r? rustfmt