feat: Add unwrap_block, offer unwrap_block and unwrap_branch#22179
Merged
Conversation
rustbot
added
the
S-waiting-on-review
rustbot
removed
the
S-waiting-on-review
Example
---
```rust
fn main() {
match rel_path {
Ok(rel_path) => {$0
if true {
foo()
}
}
Err(_) => None,
}
}
```
**Before this PR**
```text
Unwrap branch
```
**After this PR**
```text
Unwrap branch
Unwrap block
```
```rust
fn main() {
match rel_path {
Ok(rel_path) => if true {
foo()
}
Err(_) => None,
}
}
```
A4-Tacks
force-pushed
the
pure-unwrap-block
branch
from
f92faaf to
fcd9a26
Compare
rustbot
added
the
S-waiting-on-review
| let target = block.syntax().text_range(); | ||
| let tail_expr = block.tail_expr()?; | ||
| let stmt_list = block.stmt_list()?; | ||
| let container = Either::<ast::MatchArm, ast::ClosureExpr>::cast(block.syntax().parent()?)?; |
Contributor
There was a problem hiding this comment.
Won't closures also have "Unwrap block" from the unwrap_branch assist?
Member
Author
There was a problem hiding this comment.
unwrap_branch only unwrap branches and does not include ClosureExpr
ChayimFriedman2
approved these changes
Apr 26, 2026
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.
Close #13747
Example
Before this PR
After this PR