Greatly simplify the macros for flags that affect target modifiers#154501
Closed
Zalathar wants to merge 2 commits intorust-lang:mainfrom
Closed
Greatly simplify the macros for flags that affect target modifiers#154501Zalathar wants to merge 2 commits intorust-lang:mainfrom
Zalathar wants to merge 2 commits intorust-lang:mainfrom
Conversation
rustbot
added
S-waiting-on-review
Collaborator
|
rustbot has assigned @dingxiangfei2009. Use Why was this reviewer chosen?The reviewer was selected based on:
|
This commit reformats the two main command-line-flag macros to be more regular and readable. Most of the changes are whitespace adjustments, but there are a few places where braces or commas have been tweaked as well.
By using the unstable `${ignore(..)}` metavar to help perform conditional
expansion for a subset of list items, we can eliminate several complex helper
macros.
Collaborator
|
This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed. Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers. |
Contributor
|
☔ The latest upstream changes (presumably #155267) made this pull request unmergeable. Please resolve the merge conflicts. |
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Apr 15, 2026
Reformat `top_level_options!` and `options!` macro declarations These macros are already tricky, and having weird formatting doesn't help. Using a more regular style makes it easier to see where nesting begins and ends. Extracted from rust-lang#154501 after the changes in rust-lang#149357 made rebasing very difficult. There should be no change to compiler behaviour.
rust-timer
added a commit
that referenced
this pull request
Apr 15, 2026
Rollup merge of #155331 - Zalathar:options-fmt, r=petrochenkov Reformat `top_level_options!` and `options!` macro declarations These macros are already tricky, and having weird formatting doesn't help. Using a more regular style makes it easier to see where nesting begins and ends. Extracted from #154501 after the changes in #149357 made rebasing very difficult. There should be no change to compiler behaviour.
Member
Author
|
Closing this as too difficult to rebase. I'll consider a fresh implementation on top of #155331. |
rustbot
removed
the
S-waiting-on-review
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
#133138 added a very complicated system of parser macros for dealing with command-line flags that affect target modifiers.
This PR takes advantage of the unstable
${ignore(..)}metavar to replace those parser macros with much simpler conditional expansions, while still producing the same functionality and API surface.As suggested by #133138 (comment), it's possible that this functionality doesn't really need to involve macros at all. This PR doesn't go that far, but should make that change easier to perform as follow-up work.