Take into account ExprKind::Scope when calculating span of temporary

rust-lang · Mar 9, 2021 · d6c737a · d6c737a
1 parent 5f38c83
commit d6c737a
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/compiler/rustc_mir_build/src/build/expr/stmt.rs b/compiler/rustc_mir_build/src/build/expr/stmt.rs
@@ -141,12 +141,12 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                     if let ExprKind::Block { body } = &expr.kind {
                         if let Some(tail_expr) = &body.expr {
                             let mut expr = &*tail_expr;
-                            while let ExprKind::Block { body: subblock } = &expr.kind {
-                                if let Some(subtail_expr) = &subblock.expr {
-                                    expr = subtail_expr
-                                } else {
-                                    break;
-                                }
+                            while let ExprKind::Block {
+                                body: Block { expr: Some(nested_expr), .. },
+                            }
+                            | ExprKind::Scope { value: nested_expr, .. } = &expr.kind
+                            {
+                                expr = nested_expr;
                             }
                             this.block_context.push(BlockFrame::TailExpr {
                                 tail_result_is_ignored: true,