about summary refs log tree commit diff
path: root/src/libsyntax/ext/base.rs
diff options
context:
space:
mode:
authorMarvin Löbel <loebel.marvin@gmail.com>2013-09-02 03:45:37 +0200
committerMarvin Löbel <loebel.marvin@gmail.com>2013-09-03 14:45:06 +0200
commit74190853373c7963d933e2fb5c2ac2f761fdbc02 (patch)
tree12ffa50679235aab28c7bf26799504d7ac8b8ac6 /src/libsyntax/ext/base.rs
parent58decdd7a115f2892d63fa3760fa2125eb784ac8 (diff)
downloadrust-74190853373c7963d933e2fb5c2ac2f761fdbc02.tar.gz
rust-74190853373c7963d933e2fb5c2ac2f761fdbc02.zip
Modernized a few more types in syntax::ast
Diffstat (limited to 'src/libsyntax/ext/base.rs')
-rw-r--r--src/libsyntax/ext/base.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libsyntax/ext/base.rs b/src/libsyntax/ext/base.rs
index 913b68da0cb..50683358f87 100644
--- a/src/libsyntax/ext/base.rs
+++ b/src/libsyntax/ext/base.rs
@@ -62,11 +62,11 @@ pub type SyntaxExpanderTTItemFun = @fn(@ExtCtxt,
                                     -> MacResult;
 
 pub enum MacResult {
-    MRExpr(@ast::expr),
+    MRExpr(@ast::Expr),
     MRItem(@ast::item),
-    MRAny(@fn() -> @ast::expr,
+    MRAny(@fn() -> @ast::Expr,
           @fn() -> Option<@ast::item>,
-          @fn() -> @ast::stmt),
+          @fn() -> @ast::Stmt),
     MRDef(MacroDef)
 }
 
@@ -319,9 +319,9 @@ impl ExtCtxt {
     }
 }
 
-pub fn expr_to_str(cx: @ExtCtxt, expr: @ast::expr, err_msg: &str) -> @str {
+pub fn expr_to_str(cx: @ExtCtxt, expr: @ast::Expr, err_msg: &str) -> @str {
     match expr.node {
-      ast::expr_lit(l) => match l.node {
+      ast::ExprLit(l) => match l.node {
         ast::lit_str(s) => s,
         _ => cx.span_fatal(l.span, err_msg)
       },
@@ -353,7 +353,7 @@ pub fn get_single_str_from_tts(cx: @ExtCtxt,
 
 pub fn get_exprs_from_tts(cx: @ExtCtxt,
                           sp: Span,
-                          tts: &[ast::token_tree]) -> ~[@ast::expr] {
+                          tts: &[ast::token_tree]) -> ~[@ast::Expr] {
     let p = parse::new_parser_from_tts(cx.parse_sess(),
                                        cx.cfg(),
                                        tts.to_owned());