($me:expr) => {
$me.make_expr().map(|e| {
SmallVector::one(P(codemap::respan(
- e.span, ast::StmtExpr(e, ast::DUMMY_NODE_ID))))
+ e.span, ast::StmtKind::Expr(e, ast::DUMMY_NODE_ID))))
})
}
}
return Some(p);
}
if let Some(e) = self.expr {
- if let ast::ExprLit(_) = e.node {
+ if let ast::ExprKind::Lit(_) = e.node {
return Some(P(ast::Pat {
id: ast::DUMMY_NODE_ID,
span: e.span,
pub fn raw_expr(sp: Span) -> P<ast::Expr> {
P(ast::Expr {
id: ast::DUMMY_NODE_ID,
- node: ast::ExprLit(P(codemap::respan(sp, ast::LitBool(false)))),
+ node: ast::ExprKind::Lit(P(codemap::respan(sp, ast::LitKind::Bool(false)))),
span: sp,
attrs: None,
})
pub fn raw_ty(sp: Span) -> P<ast::Ty> {
P(ast::Ty {
id: ast::DUMMY_NODE_ID,
- node: ast::TyInfer,
+ node: ast::TyKind::Infer,
span: sp
})
}
fn make_stmts(self: Box<DummyResult>) -> Option<SmallVector<P<ast::Stmt>>> {
Some(SmallVector::one(P(
codemap::respan(self.span,
- ast::StmtExpr(DummyResult::raw_expr(self.span),
- ast::DUMMY_NODE_ID)))))
+ ast::StmtKind::Expr(DummyResult::raw_expr(self.span),
+ ast::DUMMY_NODE_ID)))))
}
}
// we want to be able to handle e.g. concat("foo", "bar")
let expr = cx.expander().fold_expr(expr);
match expr.node {
- ast::ExprLit(ref l) => match l.node {
- ast::LitStr(ref s, style) => return Some(((*s).clone(), style)),
+ ast::ExprKind::Lit(ref l) => match l.node {
+ ast::LitKind::Str(ref s, style) => return Some(((*s).clone(), style)),
_ => cx.span_err(l.span, err_msg)
},
_ => cx.span_err(expr.span, err_msg)