Skip to content

Remove repeated --style-edition option - #7050

Merged
jieyouxu merged 1 commit into
rust-lang:mainfrom
matthewhughes934:remove-repeated-option
Aug 24, 2026
Merged

Remove repeated --style-edition option#7050
jieyouxu merged 1 commit into
rust-lang:mainfrom
matthewhughes934:remove-repeated-option

Conversation

@matthewhughes934

Copy link
Copy Markdown
Contributor

Due to a quirk of history, there were two version of this flag. The flag used to be nested under is_nightly but then separately:

  • f649c4c: move it to the main options, with (unstable)
  • 840eb96: moved it to the main options, without (unstable)

Those two commits were part of subtree pushes, so the two commits were likely made at roughly the same time on different subtrees.

There should be no functional change here, the flags were identical, so no distinction was ever made when matching on them with matches.opt_str("style-edition")

Fixes: #7046

@rustbot rustbot added the S-waiting-on-review Status: awaiting review from the assignee but also interested parties. label Aug 23, 2026
Due to a quirk of history, there were two version of this flag. The flag
used to be nested under `is_nightly` but then separately:

* f649c4c: move it to the main options,
  with `(unstable)`
* 840eb96: moved it to the main
  options, without `(unstable)`

Those two commits were part of subtree pushes, so the two commits were
likely made at roughly the same time on different subtrees.

There should be no functional change here, the flags were identical, so
no distinction was ever made when matching on them with
`matches.opt_str("style-edition")`

Fixes: rust-lang#7046

@jieyouxu jieyouxu left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

@jieyouxu jieyouxu added the A-cli Area: command-line interface label Aug 24, 2026
@jieyouxu

Copy link
Copy Markdown
Member

Those two commits were part of subtree pushes, so the two commits were likely made at roughly the same time on different subtrees.

The second commit was probably my fault 😆 I think I only changed the nightly gating but didn't notice the double-registration on rust-lang/rust side

@jieyouxu
jieyouxu added this pull request to the merge queue Aug 24, 2026
Merged via the queue into rust-lang:main with commit bbfd120 Aug 24, 2026
27 checks passed
@rustbot rustbot added release-notes Needs an associated changelog entry and removed S-waiting-on-review Status: awaiting review from the assignee but also interested parties. labels Aug 24, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-cli Area: command-line interface release-notes Needs an associated changelog entry

Projects

None yet

Development

Successfully merging this pull request may close these issues.

style-edition cmdline flag is listed twice in --help

3 participants