Rollup merge of #34436 - jseyfried:no_block_expr, r=eddyb

[rust.git] / src / librustc_driver / driver.rs

diff --git a/src/librustc_driver/driver.rs b/src/librustc_driver/driver.rs
index c0be92984392e60a04d5aa67f4a3b4a4c5a9850a..eb442c0a34e74cb68ba015fb765b3f2e61e262c3 100644 (file)
--- a/src/librustc_driver/driver.rs
+++ b/src/librustc_driver/driver.rs
@@ -763,7 +763,6 @@ pub fn phase_2_configure_and_expand<'a>(sess: &Session,
 }
 
 pub fn assign_node_ids(sess: &Session, krate: ast::Crate) -> ast::Crate {
-    use syntax::codemap::Spanned;
     use syntax::ptr::P;
     use syntax::util::move_map::MoveMap;
 
@@ -783,12 +782,12 @@ fn fold_block(&mut self, block: P<ast::Block>) -> P<ast::Block> {
 
                 let stmt = block.stmts.pop();
                 block.stmts = block.stmts.move_flat_map(|s| self.fold_stmt(s).into_iter());
-                if let Some(Spanned { node: ast::StmtKind::Expr(expr, _), span }) = stmt {
+                if let Some(ast::Stmt { node: ast::StmtKind::Expr(expr), span, .. }) = stmt {
                     let expr = self.fold_expr(expr);
-                    let id = expr.id;
-                    block.stmts.push(Spanned {
+                    block.stmts.push(ast::Stmt {
+                        id: expr.id,
+                        node: ast::StmtKind::Expr(expr),
                         span: span,
-                        node: ast::StmtKind::Expr(expr, id)
                     });
                 } else if let Some(stmt) = stmt {
                     block.stmts.extend(self.fold_stmt(stmt));