diff --git a/crates/ra_assists/src/handlers/unwrap_block.rs b/crates/ra_assists/src/handlers/unwrap_block.rs
index 8912ce64511..58649c47eb6 100644
--- a/crates/ra_assists/src/handlers/unwrap_block.rs
+++ b/crates/ra_assists/src/handlers/unwrap_block.rs
@@ -76,12 +76,11 @@ pub(crate) fn unwrap_block(ctx: AssistCtx) -> Option<Assist> {
     })
 }
 
-fn extract_expr(cursor_range: TextRange, block_expr: BlockExpr) -> Option<Expr> {
-    let block = block_expr.block()?;
+fn extract_expr(cursor_range: TextRange, block: BlockExpr) -> Option<Expr> {
     let cursor_in_range = block.l_curly_token()?.text_range().contains_range(cursor_range);
 
     if cursor_in_range {
-        Some(unwrap_trivial_block(block_expr))
+        Some(unwrap_trivial_block(block))
     } else {
         None
     }