mbe: Clean up code with non-optional NonterminalKind
#142657
Merged
+216
−164
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
rustbot
added
S-waiting-on-review
tgross35
force-pushed
the
nonoptional-fragment-specifiers-cleanup
branch
from
91218e6 to
093240b
Compare
|
Can be reviewed by-commit, the first commit is just refactoring a heavily nested function. |
tgross35
commented
Jun 18, 2025
tgross35
force-pushed
the
nonoptional-fragment-specifiers-cleanup
branch
from
093240b to
2cff3c2
Compare
tgross35
commented
Jun 18, 2025
tgross35
force-pushed
the
nonoptional-fragment-specifiers-cleanup
branch
from
2cff3c2 to
1ddb1c4
Compare
petrochenkov
added
S-waiting-on-author
Non-functional change to simplify control flow.
Since [1], the fragment specifier is unconditionally required in all editions. This means `NonTerminalKind` no longer needs to be optional, as we can reject this code during the expansion of `macro_rules!` rather than handling it throughout the code. Do this cleanup here. [1]: rust-lang#128425
`tt` should match more, so use this for both missing and invalid fragment specifiers. Also remove one unneeded instance of `String`.
tgross35
force-pushed
the
nonoptional-fragment-specifiers-cleanup
branch
from
1ddb1c4 to
b9e9be3
Compare
tgross35
changed the title
NonterminalKindNonterminalKind
|
Switched to use @rustbot review |
rustbot
added
S-waiting-on-review
|
@bors r+ |
bors
added
S-waiting-on-bors
workingjubilee
added a commit
to workingjubilee/rustc
that referenced
this pull request
Jun 24, 2025
…ifiers-cleanup, r=petrochenkov mbe: Clean up code with non-optional `NonterminalKind` Since [rust-lang#128425], the fragment specifier is unconditionally required in all editions. This means `NonTerminalKind` no longer needs to be optional, as we can reject this code during the expansion of `macro_rules!` rather than handling it throughout the code. Do this cleanup here. [rust-lang#128425]: rust-lang#128425
bors
added a commit
that referenced
this pull request
Jun 24, 2025
Rollup of 9 pull requests Successful merges: - #142645 (Also emit suggestions for usages in the `non_upper_case_globals` lint) - #142657 (mbe: Clean up code with non-optional `NonterminalKind`) - #142799 (rustc_session: Add a structure for keeping both explicit and default sysroots) - #142805 (Emit a single error when importing a path with `_`) - #142882 (Lazy init diagnostics-only local_names in borrowck) - #142883 (Add impl_trait_in_bindings tests from #61773) - #142943 (Don't include current rustc version string in feature removed help) - #142965 ([RTE-497] Ignore `c-link-to-rust-va-list-fn` test on SGX platform) - #142972 (Add a missing mailmap entry) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
that referenced
this pull request
Jun 25, 2025
Rollup merge of #142657 - tgross35:nonoptional-fragment-specifiers-cleanup, r=petrochenkov mbe: Clean up code with non-optional `NonterminalKind` Since [#128425], the fragment specifier is unconditionally required in all editions. This means `NonTerminalKind` no longer needs to be optional, as we can reject this code during the expansion of `macro_rules!` rather than handling it throughout the code. Do this cleanup here. [#128425]: #128425
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.
Since rust-lang/rust#128425, the fragment specifier is unconditionally required in all
editions. This means
NonTerminalKindno longer needs to be optional,as we can reject this code during the expansion of
macro_rules!ratherthan handling it throughout the code. Do this cleanup here.
r? @petrochenkov