Support else-branch for move_guard#21508
Merged
ChayimFriedman2 merged 3 commits intorust-lang:masterfrom Feb 3, 2026
Merged
Conversation
Example
---
```rust
fn main() {
match 92 {
x @ 0..30 $0if x % 3 == 0 => false,
x @ 0..30 if x % 2 == 0 => true,
_ => false
}
}
```
**Before this PR**
```rust
fn main() {
match 92 {
x @ 0..30 => if x % 3 == 0 {
false
},
x @ 0..30 if x % 2 == 0 => true,
_ => false
}
}
```
**After this PR**
```rust
fn main() {
match 92 {
x @ 0..30 => if x % 3 == 0 {
false
} else if x % 2 == 0 {
true
},
_ => false
}
}
```
ChayimFriedman2
requested changes
Jan 26, 2026
Contributor
ChayimFriedman2
left a comment
There was a problem hiding this comment.
This will transform the code wrongly if the user is selecting the non-first arm.
Other than that, LGTM.
Member
Author
From testing, it is expected |
Contributor
|
I meant where there is an empty selection, so all matching arms are eligible, but we'll reorder them to put the arm where the cursor is first. |
Member
Author
Why are we doing this? The current logic is consistent with |
Contributor
|
Okay, I see now. I think this isn't the best behavior but since it's consistent, LGTM. Thanks! |
ChayimFriedman2
approved these changes
Feb 3, 2026
github-merge-queue bot
pushed a commit
that referenced
this pull request
Feb 3, 2026
Support else-branch for move_guard
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
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.
Example
Before this PR
After this PR