}
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;
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));