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.
diff --git a/src/gen/visit.rs b/src/gen/visit.rs
index 69a9ec0..d241aa0 100644
--- a/src/gen/visit.rs
+++ b/src/gen/visit.rs
@@ -209,7 +209,7 @@
# [ cfg ( feature = "full" ) ]
fn visit_item_impl(&mut self, i: &ItemImpl) { visit_item_impl(self, i) }
# [ cfg ( feature = "full" ) ]
-fn visit_item_mac(&mut self, i: &ItemMac) { visit_item_mac(self, i) }
+fn visit_item_macro(&mut self, i: &ItemMacro) { visit_item_macro(self, i) }
# [ cfg ( feature = "full" ) ]
fn visit_item_mod(&mut self, i: &ItemMod) { visit_item_mod(self, i) }
# [ cfg ( feature = "full" ) ]
@@ -228,11 +228,11 @@
fn visit_lifetime_def(&mut self, i: &LifetimeDef) { visit_lifetime_def(self, i) }
# [ cfg ( feature = "full" ) ]
fn visit_local(&mut self, i: &Local) { visit_local(self, i) }
-
-fn visit_mac(&mut self, i: &Mac) { visit_mac(self, i) }
# [ cfg ( feature = "full" ) ]
fn visit_mac_stmt_style(&mut self, i: &MacStmtStyle) { visit_mac_stmt_style(self, i) }
+fn visit_macro(&mut self, i: &Macro) { visit_macro(self, i) }
+
fn visit_meta_item(&mut self, i: &MetaItem) { visit_meta_item(self, i) }
fn visit_meta_item_list(&mut self, i: &MetaItemList) { visit_meta_item_list(self, i) }
@@ -301,7 +301,7 @@
# [ cfg ( feature = "full" ) ]
fn visit_trait_item_const(&mut self, i: &TraitItemConst) { visit_trait_item_const(self, i) }
# [ cfg ( feature = "full" ) ]
-fn visit_trait_item_mac(&mut self, i: &TraitItemMac) { visit_trait_item_mac(self, i) }
+fn visit_trait_item_macro(&mut self, i: &TraitItemMacro) { visit_trait_item_macro(self, i) }
# [ cfg ( feature = "full" ) ]
fn visit_trait_item_method(&mut self, i: &TraitItemMethod) { visit_trait_item_method(self, i) }
# [ cfg ( feature = "full" ) ]
@@ -879,8 +879,8 @@
Ret(ref _binding_0, ) => {
full!(_visitor.visit_expr_ret(&* _binding_0));
}
- Mac(ref _binding_0, ) => {
- _visitor.visit_mac(&* _binding_0);
+ Macro(ref _binding_0, ) => {
+ _visitor.visit_macro(&* _binding_0);
}
Struct(ref _binding_0, ) => {
full!(_visitor.visit_expr_struct(&* _binding_0));
@@ -1158,7 +1158,7 @@
_visitor.visit_impl_item_type(&* _binding_0);
}
Macro(ref _binding_0, ) => {
- _visitor.visit_mac(&* _binding_0);
+ _visitor.visit_macro(&* _binding_0);
}
}
}
@@ -1247,8 +1247,8 @@
Impl(ref _binding_0, ) => {
_visitor.visit_item_impl(&* _binding_0);
}
- Mac(ref _binding_0, ) => {
- _visitor.visit_item_mac(&* _binding_0);
+ Macro(ref _binding_0, ) => {
+ _visitor.visit_item_macro(&* _binding_0);
}
}
}
@@ -1325,9 +1325,9 @@
for it in (_i . items).iter() { _visitor.visit_impl_item(&it) };
}
# [ cfg ( feature = "full" ) ]
-pub fn visit_item_mac<V: Visitor + ?Sized>(_visitor: &mut V, _i: &ItemMac) {
+pub fn visit_item_macro<V: Visitor + ?Sized>(_visitor: &mut V, _i: &ItemMacro) {
for it in (_i . attrs).iter() { _visitor.visit_attribute(&it) };
- _visitor.visit_mac(&_i . mac);
+ _visitor.visit_macro(&_i . mac);
}
# [ cfg ( feature = "full" ) ]
pub fn visit_item_mod<V: Visitor + ?Sized>(_visitor: &mut V, _i: &ItemMod) {
@@ -1420,13 +1420,6 @@
if let Some(ref it) = _i . init { _visitor.visit_expr(&* it) };
for it in (_i . attrs).iter() { _visitor.visit_attribute(&it) };
}
-
-pub fn visit_mac<V: Visitor + ?Sized>(_visitor: &mut V, _i: &Mac) {
- _visitor.visit_path(&_i . path);
- // Skipped field _i . bang_token;
- // Skipped field _i . ident;
- // Skipped field _i . tokens;
-}
# [ cfg ( feature = "full" ) ]
pub fn visit_mac_stmt_style<V: Visitor + ?Sized>(_visitor: &mut V, _i: &MacStmtStyle) {
use ::MacStmtStyle::*;
@@ -1439,6 +1432,13 @@
}
}
+pub fn visit_macro<V: Visitor + ?Sized>(_visitor: &mut V, _i: &Macro) {
+ _visitor.visit_path(&_i . path);
+ // Skipped field _i . bang_token;
+ // Skipped field _i . ident;
+ // Skipped field _i . tokens;
+}
+
pub fn visit_meta_item<V: Visitor + ?Sized>(_visitor: &mut V, _i: &MetaItem) {
use ::MetaItem::*;
match *_i {
@@ -1543,8 +1543,8 @@
Slice(ref _binding_0, ) => {
_visitor.visit_pat_slice(&* _binding_0);
}
- Mac(ref _binding_0, ) => {
- _visitor.visit_mac(&* _binding_0);
+ Macro(ref _binding_0, ) => {
+ _visitor.visit_macro(&* _binding_0);
}
}
}
@@ -1704,7 +1704,7 @@
_visitor.visit_expr(&* _binding_0);
// Skipped field * _binding_1;
}
- Mac(ref _binding_0, ) => {
+ Macro(ref _binding_0, ) => {
// Skipped field * _binding_0;
}
}
@@ -1733,7 +1733,7 @@
_visitor.visit_trait_item_type(&* _binding_0);
}
Macro(ref _binding_0, ) => {
- _visitor.visit_trait_item_mac(&* _binding_0);
+ _visitor.visit_trait_item_macro(&* _binding_0);
}
}
}
@@ -1748,9 +1748,9 @@
// Skipped field _i . semi_token;
}
# [ cfg ( feature = "full" ) ]
-pub fn visit_trait_item_mac<V: Visitor + ?Sized>(_visitor: &mut V, _i: &TraitItemMac) {
+pub fn visit_trait_item_macro<V: Visitor + ?Sized>(_visitor: &mut V, _i: &TraitItemMacro) {
for it in (_i . attrs).iter() { _visitor.visit_attribute(&it) };
- _visitor.visit_mac(&_i . mac);
+ _visitor.visit_macro(&_i . mac);
}
# [ cfg ( feature = "full" ) ]
pub fn visit_trait_item_method<V: Visitor + ?Sized>(_visitor: &mut V, _i: &TraitItemMethod) {
@@ -1812,8 +1812,8 @@
Infer(ref _binding_0, ) => {
_visitor.visit_ty_infer(&* _binding_0);
}
- Mac(ref _binding_0, ) => {
- _visitor.visit_mac(&* _binding_0);
+ Macro(ref _binding_0, ) => {
+ _visitor.visit_macro(&* _binding_0);
}
}
}