Add macro matcher for guard fragment specifier#153702
Merged
rust-bors[bot] merged 1 commit intorust-lang:mainfrom Mar 25, 2026
Merged
Add macro matcher for guard fragment specifier#153702rust-bors[bot] merged 1 commit intorust-lang:mainfrom
guard fragment specifier#153702rust-bors[bot] merged 1 commit intorust-lang:mainfrom
Conversation
Collaborator
|
The parser was modified, potentially altering the grammar of (stable) Rust cc @fmease |
rustbot
added
S-waiting-on-review
Collaborator
|
r? @davidtwco rustbot has assigned @davidtwco. Use Why was this reviewer chosen?The reviewer was selected based on:
|
4 tasks
SpriteOvO
added
A-macros
This comment has been minimized.
This comment has been minimized.
SpriteOvO
force-pushed
the
guard-matcher
branch
from
b39f0f3 to
dc0fa6b
Compare
Collaborator
|
Some changes occurred in src/tools/clippy cc @rust-lang/clippy |
This comment has been minimized.
This comment has been minimized.
SpriteOvO
force-pushed
the
guard-matcher
branch
from
dc0fa6b to
9729bb2
Compare
Collaborator
|
Some changes occurred in src/tools/rustfmt cc @rust-lang/rustfmt |
rustbot
added
the
T-rustfmt
davidtwco
approved these changes
Mar 25, 2026
Member
|
@bors r+ |
Contributor
rust-bors
bot
added
S-waiting-on-bors
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Mar 25, 2026
Add macro matcher for `guard` fragment specifier Tracking issue rust-lang#153104 This PR implements a new `guard` macro matcher to match `if-let` guards (specifically [`MatchArmGuard`](https://github.com/rust-lang/reference/blob/50a1075e879be75aeec436252c84eef0fad489f4/src/expressions/match-expr.md#match-guards)). In the upcoming PR, we can use this new matcher in the `matches!` and `assert_matches!` macros to support their use with `if-let` guards. (see rust-lang#152313) The original `Expr` used to represent a guard has been wrapped in a new `Guard` type, allowing us to carry the span information of the leading `if` keyword. However, it might be even better to include the `if` keyword in the `Guard` type as well? I've left a FIXME comment in the code.
This was referenced Mar 25, 2026
rust-bors bot
pushed a commit
that referenced
this pull request
Mar 25, 2026
…uwer Rollup of 22 pull requests Successful merges: - #153049 (Add `-Zsanitize=kernel-hwaddress`) - #153702 (Add macro matcher for `guard` fragment specifier) - #154200 (debuginfo: emit DW_TAG_call_site entries) - #154263 (interpret: when passing an argument fails, point at that argument) - #154269 (miri recursive validation: only check one layer deep) - #154313 (Init `self_decl` with a correct visibility) - #154344 (Update LLVM to 22.1.2) - #154348 (re-enable enzyme/autodiff builds on dist-aarch64-apple) - #154351 (Overhaul `Erasable` impls) - #154363 (delegation: fix zero-args nested delegation ICE) - #154364 (delegation: don't propagate synthetic params, remove lifetime hacks) - #151148 (Add functions to `GrowableBitSet`) - #154090 (Move tests in the statics category) - #154112 (some `tests/ui/macros` cleanup) - #154131 (begin `tests/ui/structs-enums` cleanup) - #154216 (unstably mark `NonNull::with_exposed_provenance` as const) - #154230 (Moved and rename issue-50411 to tests/ui/mir/inliner-double-elaborate) - #154233 (Move ui/issues tests to relevant subdirectories) - #154288 (Fix typo in doc comment for `char::to_titlecase`) - #154355 (delegation: add const type ICE test) - #154358 (install-template.sh: Optimize by using Bourne shell builtins.) - #154360 (fromrangeiter-overflow-checks: accept optional `signext` for argument)
github-actions bot
pushed a commit
to rust-lang/miri
that referenced
this pull request
Mar 26, 2026
…uwer Rollup of 22 pull requests Successful merges: - rust-lang/rust#153049 (Add `-Zsanitize=kernel-hwaddress`) - rust-lang/rust#153702 (Add macro matcher for `guard` fragment specifier) - rust-lang/rust#154200 (debuginfo: emit DW_TAG_call_site entries) - rust-lang/rust#154263 (interpret: when passing an argument fails, point at that argument) - rust-lang/rust#154269 (miri recursive validation: only check one layer deep) - rust-lang/rust#154313 (Init `self_decl` with a correct visibility) - rust-lang/rust#154344 (Update LLVM to 22.1.2) - rust-lang/rust#154348 (re-enable enzyme/autodiff builds on dist-aarch64-apple) - rust-lang/rust#154351 (Overhaul `Erasable` impls) - rust-lang/rust#154363 (delegation: fix zero-args nested delegation ICE) - rust-lang/rust#154364 (delegation: don't propagate synthetic params, remove lifetime hacks) - rust-lang/rust#151148 (Add functions to `GrowableBitSet`) - rust-lang/rust#154090 (Move tests in the statics category) - rust-lang/rust#154112 (some `tests/ui/macros` cleanup) - rust-lang/rust#154131 (begin `tests/ui/structs-enums` cleanup) - rust-lang/rust#154216 (unstably mark `NonNull::with_exposed_provenance` as const) - rust-lang/rust#154230 (Moved and rename issue-50411 to tests/ui/mir/inliner-double-elaborate) - rust-lang/rust#154233 (Move ui/issues tests to relevant subdirectories) - rust-lang/rust#154288 (Fix typo in doc comment for `char::to_titlecase`) - rust-lang/rust#154355 (delegation: add const type ICE test) - rust-lang/rust#154358 (install-template.sh: Optimize by using Bourne shell builtins.) - rust-lang/rust#154360 (fromrangeiter-overflow-checks: accept optional `signext` for argument)
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
4 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.
Tracking issue #153104
This PR implements a new
guardmacro matcher to matchif-letguards (specificallyMatchArmGuard). In the upcoming PR, we can use this new matcher in thematches!andassert_matches!macros to support their use withif-letguards. (see #152313)The original
Exprused to represent a guard has been wrapped in a newGuardtype, allowing us to carry the span information of the leadingifkeyword. However, it might be even better to include theifkeyword in theGuardtype as well? I've left a FIXME comment in the code.