commit decf28df733c1aabb987582c59bac79ba45c8eab
author David Tolnay <dtolnay@gmail.com> Sat Nov 11 11:56:45 2017 -0800
committer David Tolnay <dtolnay@gmail.com> Sat Nov 11 12:49:01 2017 -0800
tree 6d6834f483767373cbaff6d469edb7c950370dce
parent d3153540d1d056bccf4550e43bdca4059ab85c8e

Rename Mac -> Macro

This is part of a move to standardize on abbreviating only those types in the
AST that are abbreviated in Rust source code, like `impl` or `fn`. The grammar
of Rust source code never abbreviates `macro` to `mac`, so this commit reflects
that.

Field names are being kept as `mac` because `macro` is a reserved word.

src/expr.rs

diff --git a/src/expr.rs b/src/expr.rs
index fb71ef7..6579c7a 100644
--- a/src/expr.rs
+++ b/src/expr.rs
@@ -291,7 +291,7 @@
         }),
 
         /// A macro invocation; pre-expansion
-        pub Mac(Mac),
+        pub Macro(Macro),
 
         /// A struct literal expression.
         ///
@@ -407,7 +407,7 @@
         Semi(Box<Expr>, tokens::Semi),
 
         /// Macro invocation.
-        Mac(Box<(Mac, MacStmtStyle, Vec<Attribute>)>),
+        Macro(Box<(Macro, MacStmtStyle, Vec<Attribute>)>),
     }
 }
 
@@ -537,7 +537,7 @@
             pub bracket_token: tokens::Bracket,
         }),
         /// A macro pattern; pre-expansion
-        pub Mac(Mac),
+        pub Macro(Macro),
     }
 }
 
@@ -1160,7 +1160,7 @@
         |
         syn!(ExprParen) => { ExprKind::Paren } // must be before expr_tup
         |
-        syn!(Mac) => { ExprKind::Mac } // must be before expr_path
+        syn!(Macro) => { ExprKind::Macro } // must be before expr_path
         |
         call!(expr_break, allow_struct) // must be before expr_path
         |
@@ -1213,7 +1213,7 @@
         |
         syn!(ExprParen) => { ExprKind::Paren } // must be before expr_tup
         |
-        syn!(Mac) => { ExprKind::Mac } // must be before expr_path
+        syn!(Macro) => { ExprKind::Macro } // must be before expr_path
         |
         syn!(ExprPath) => { ExprKind::Path }
     ));
@@ -1846,8 +1846,8 @@
     // expression statements
         data: braces!(syn!(TokenStream)) >>
         semi: option!(syn!(Semi)) >>
-        (Stmt::Mac(Box::new((
-            Mac {
+        (Stmt::Macro(Box::new((
+            Macro {
                 path: what,
                 bang_token: bang,
                 ident: None,
@@ -1930,7 +1930,7 @@
             |
             syn!(PatStruct) => { Pat::Struct } // must be before pat_ident
             |
-            syn!(Mac) => { Pat::Mac } // must be before pat_ident
+            syn!(Macro) => { Pat::Macro } // must be before pat_ident
             |
             syn!(PatLit) => { Pat::Lit } // must be before pat_ident
             |
@@ -2959,7 +2959,7 @@
                     expr.to_tokens(tokens);
                     semi.to_tokens(tokens);
                 }
-                Stmt::Mac(ref mac) => {
+                Stmt::Macro(ref mac) => {
                     let (ref mac, ref style, ref attrs) = **mac;
                     tokens.append_all(attrs.outer());
                     mac.to_tokens(tokens);