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/fold.rs b/src/gen/fold.rs
index 8290450..b38f04c 100644
--- a/src/gen/fold.rs
+++ b/src/gen/fold.rs
@@ -236,7 +236,7 @@
# [ cfg ( feature = "full" ) ]
fn fold_item_impl(&mut self, i: ItemImpl) -> ItemImpl { fold_item_impl(self, i) }
# [ cfg ( feature = "full" ) ]
-fn fold_item_mac(&mut self, i: ItemMac) -> ItemMac { fold_item_mac(self, i) }
+fn fold_item_macro(&mut self, i: ItemMacro) -> ItemMacro { fold_item_macro(self, i) }
# [ cfg ( feature = "full" ) ]
fn fold_item_mod(&mut self, i: ItemMod) -> ItemMod { fold_item_mod(self, i) }
# [ cfg ( feature = "full" ) ]
@@ -255,11 +255,11 @@
fn fold_lifetime_def(&mut self, i: LifetimeDef) -> LifetimeDef { fold_lifetime_def(self, i) }
# [ cfg ( feature = "full" ) ]
fn fold_local(&mut self, i: Local) -> Local { fold_local(self, i) }
-
-fn fold_mac(&mut self, i: Mac) -> Mac { fold_mac(self, i) }
# [ cfg ( feature = "full" ) ]
fn fold_mac_stmt_style(&mut self, i: MacStmtStyle) -> MacStmtStyle { fold_mac_stmt_style(self, i) }
+fn fold_macro(&mut self, i: Macro) -> Macro { fold_macro(self, i) }
+
fn fold_meta_item(&mut self, i: MetaItem) -> MetaItem { fold_meta_item(self, i) }
fn fold_meta_item_list(&mut self, i: MetaItemList) -> MetaItemList { fold_meta_item_list(self, i) }
@@ -328,7 +328,7 @@
# [ cfg ( feature = "full" ) ]
fn fold_trait_item_const(&mut self, i: TraitItemConst) -> TraitItemConst { fold_trait_item_const(self, i) }
# [ cfg ( feature = "full" ) ]
-fn fold_trait_item_mac(&mut self, i: TraitItemMac) -> TraitItemMac { fold_trait_item_mac(self, i) }
+fn fold_trait_item_macro(&mut self, i: TraitItemMacro) -> TraitItemMacro { fold_trait_item_macro(self, i) }
# [ cfg ( feature = "full" ) ]
fn fold_trait_item_method(&mut self, i: TraitItemMethod) -> TraitItemMethod { fold_trait_item_method(self, i) }
# [ cfg ( feature = "full" ) ]
@@ -1116,9 +1116,9 @@
full!(_visitor.fold_expr_ret(_binding_0)),
)
}
- Mac(_binding_0, ) => {
- Mac (
- _visitor.fold_mac(_binding_0),
+ Macro(_binding_0, ) => {
+ Macro (
+ _visitor.fold_macro(_binding_0),
)
}
Struct(_binding_0, ) => {
@@ -1488,7 +1488,7 @@
}
Macro(_binding_0, ) => {
Macro (
- _visitor.fold_mac(_binding_0),
+ _visitor.fold_macro(_binding_0),
)
}
}
@@ -1616,9 +1616,9 @@
_visitor.fold_item_impl(_binding_0),
)
}
- Mac(_binding_0, ) => {
- Mac (
- _visitor.fold_item_mac(_binding_0),
+ Macro(_binding_0, ) => {
+ Macro (
+ _visitor.fold_item_macro(_binding_0),
)
}
}
@@ -1710,10 +1710,10 @@
}
}
# [ cfg ( feature = "full" ) ]
-pub fn fold_item_mac<V: Folder + ?Sized>(_visitor: &mut V, _i: ItemMac) -> ItemMac {
- ItemMac {
+pub fn fold_item_macro<V: Folder + ?Sized>(_visitor: &mut V, _i: ItemMacro) -> ItemMacro {
+ ItemMacro {
attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
- mac: _visitor.fold_mac(_i . mac),
+ mac: _visitor.fold_macro(_i . mac),
}
}
# [ cfg ( feature = "full" ) ]
@@ -1825,15 +1825,6 @@
attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
}
}
-
-pub fn fold_mac<V: Folder + ?Sized>(_visitor: &mut V, _i: Mac) -> Mac {
- Mac {
- path: _visitor.fold_path(_i . path),
- bang_token: _i . bang_token,
- ident: _i . ident,
- tokens: _i . tokens,
- }
-}
# [ cfg ( feature = "full" ) ]
pub fn fold_mac_stmt_style<V: Folder + ?Sized>(_visitor: &mut V, _i: MacStmtStyle) -> MacStmtStyle {
use ::MacStmtStyle::*;
@@ -1848,6 +1839,15 @@
}
}
+pub fn fold_macro<V: Folder + ?Sized>(_visitor: &mut V, _i: Macro) -> Macro {
+ Macro {
+ path: _visitor.fold_path(_i . path),
+ bang_token: _i . bang_token,
+ ident: _i . ident,
+ tokens: _i . tokens,
+ }
+}
+
pub fn fold_meta_item<V: Folder + ?Sized>(_visitor: &mut V, _i: MetaItem) -> MetaItem {
use ::MetaItem::*;
match _i {
@@ -1996,9 +1996,9 @@
_visitor.fold_pat_slice(_binding_0),
)
}
- Mac(_binding_0, ) => {
- Mac (
- _visitor.fold_mac(_binding_0),
+ Macro(_binding_0, ) => {
+ Macro (
+ _visitor.fold_macro(_binding_0),
)
}
}
@@ -2213,8 +2213,8 @@
_binding_1,
)
}
- Mac(_binding_0, ) => {
- Mac (
+ Macro(_binding_0, ) => {
+ Macro (
_binding_0,
)
}
@@ -2253,7 +2253,7 @@
}
Macro(_binding_0, ) => {
Macro (
- _visitor.fold_trait_item_mac(_binding_0),
+ _visitor.fold_trait_item_macro(_binding_0),
)
}
}
@@ -2271,10 +2271,10 @@
}
}
# [ cfg ( feature = "full" ) ]
-pub fn fold_trait_item_mac<V: Folder + ?Sized>(_visitor: &mut V, _i: TraitItemMac) -> TraitItemMac {
- TraitItemMac {
+pub fn fold_trait_item_macro<V: Folder + ?Sized>(_visitor: &mut V, _i: TraitItemMacro) -> TraitItemMacro {
+ TraitItemMacro {
attrs: FoldHelper::lift(_i . attrs, |it| { _visitor.fold_attribute(it) }),
- mac: _visitor.fold_mac(_i . mac),
+ mac: _visitor.fold_macro(_i . mac),
}
}
# [ cfg ( feature = "full" ) ]
@@ -2367,9 +2367,9 @@
_visitor.fold_ty_infer(_binding_0),
)
}
- Mac(_binding_0, ) => {
- Mac (
- _visitor.fold_mac(_binding_0),
+ Macro(_binding_0, ) => {
+ Macro (
+ _visitor.fold_macro(_binding_0),
)
}
}
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);
}
}
}
diff --git a/src/gen/visit_mut.rs b/src/gen/visit_mut.rs
index 73dd895..a8ea12a 100644
--- a/src/gen/visit_mut.rs
+++ b/src/gen/visit_mut.rs
@@ -209,7 +209,7 @@
# [ cfg ( feature = "full" ) ]
fn visit_item_impl_mut(&mut self, i: &mut ItemImpl) { visit_item_impl_mut(self, i) }
# [ cfg ( feature = "full" ) ]
-fn visit_item_mac_mut(&mut self, i: &mut ItemMac) { visit_item_mac_mut(self, i) }
+fn visit_item_macro_mut(&mut self, i: &mut ItemMacro) { visit_item_macro_mut(self, i) }
# [ cfg ( feature = "full" ) ]
fn visit_item_mod_mut(&mut self, i: &mut ItemMod) { visit_item_mod_mut(self, i) }
# [ cfg ( feature = "full" ) ]
@@ -228,11 +228,11 @@
fn visit_lifetime_def_mut(&mut self, i: &mut LifetimeDef) { visit_lifetime_def_mut(self, i) }
# [ cfg ( feature = "full" ) ]
fn visit_local_mut(&mut self, i: &mut Local) { visit_local_mut(self, i) }
-
-fn visit_mac_mut(&mut self, i: &mut Mac) { visit_mac_mut(self, i) }
# [ cfg ( feature = "full" ) ]
fn visit_mac_stmt_style_mut(&mut self, i: &mut MacStmtStyle) { visit_mac_stmt_style_mut(self, i) }
+fn visit_macro_mut(&mut self, i: &mut Macro) { visit_macro_mut(self, i) }
+
fn visit_meta_item_mut(&mut self, i: &mut MetaItem) { visit_meta_item_mut(self, i) }
fn visit_meta_item_list_mut(&mut self, i: &mut MetaItemList) { visit_meta_item_list_mut(self, i) }
@@ -301,7 +301,7 @@
# [ cfg ( feature = "full" ) ]
fn visit_trait_item_const_mut(&mut self, i: &mut TraitItemConst) { visit_trait_item_const_mut(self, i) }
# [ cfg ( feature = "full" ) ]
-fn visit_trait_item_mac_mut(&mut self, i: &mut TraitItemMac) { visit_trait_item_mac_mut(self, i) }
+fn visit_trait_item_macro_mut(&mut self, i: &mut TraitItemMacro) { visit_trait_item_macro_mut(self, i) }
# [ cfg ( feature = "full" ) ]
fn visit_trait_item_method_mut(&mut self, i: &mut TraitItemMethod) { visit_trait_item_method_mut(self, i) }
# [ cfg ( feature = "full" ) ]
@@ -879,8 +879,8 @@
Ret(ref mut _binding_0, ) => {
full!(_visitor.visit_expr_ret_mut(&mut * _binding_0));
}
- Mac(ref mut _binding_0, ) => {
- _visitor.visit_mac_mut(&mut * _binding_0);
+ Macro(ref mut _binding_0, ) => {
+ _visitor.visit_macro_mut(&mut * _binding_0);
}
Struct(ref mut _binding_0, ) => {
full!(_visitor.visit_expr_struct_mut(&mut * _binding_0));
@@ -1158,7 +1158,7 @@
_visitor.visit_impl_item_type_mut(&mut * _binding_0);
}
Macro(ref mut _binding_0, ) => {
- _visitor.visit_mac_mut(&mut * _binding_0);
+ _visitor.visit_macro_mut(&mut * _binding_0);
}
}
}
@@ -1247,8 +1247,8 @@
Impl(ref mut _binding_0, ) => {
_visitor.visit_item_impl_mut(&mut * _binding_0);
}
- Mac(ref mut _binding_0, ) => {
- _visitor.visit_item_mac_mut(&mut * _binding_0);
+ Macro(ref mut _binding_0, ) => {
+ _visitor.visit_item_macro_mut(&mut * _binding_0);
}
}
}
@@ -1325,9 +1325,9 @@
for mut it in (_i . items).iter_mut() { _visitor.visit_impl_item_mut(&mut it) };
}
# [ cfg ( feature = "full" ) ]
-pub fn visit_item_mac_mut<V: VisitorMut + ?Sized>(_visitor: &mut V, _i: &mut ItemMac) {
+pub fn visit_item_macro_mut<V: VisitorMut + ?Sized>(_visitor: &mut V, _i: &mut ItemMacro) {
for mut it in (_i . attrs).iter_mut() { _visitor.visit_attribute_mut(&mut it) };
- _visitor.visit_mac_mut(&mut _i . mac);
+ _visitor.visit_macro_mut(&mut _i . mac);
}
# [ cfg ( feature = "full" ) ]
pub fn visit_item_mod_mut<V: VisitorMut + ?Sized>(_visitor: &mut V, _i: &mut ItemMod) {
@@ -1420,13 +1420,6 @@
if let Some(ref mut it) = _i . init { _visitor.visit_expr_mut(&mut * it) };
for mut it in (_i . attrs).iter_mut() { _visitor.visit_attribute_mut(&mut it) };
}
-
-pub fn visit_mac_mut<V: VisitorMut + ?Sized>(_visitor: &mut V, _i: &mut Mac) {
- _visitor.visit_path_mut(&mut _i . path);
- // Skipped field _i . bang_token;
- // Skipped field _i . ident;
- // Skipped field _i . tokens;
-}
# [ cfg ( feature = "full" ) ]
pub fn visit_mac_stmt_style_mut<V: VisitorMut + ?Sized>(_visitor: &mut V, _i: &mut MacStmtStyle) {
use ::MacStmtStyle::*;
@@ -1439,6 +1432,13 @@
}
}
+pub fn visit_macro_mut<V: VisitorMut + ?Sized>(_visitor: &mut V, _i: &mut Macro) {
+ _visitor.visit_path_mut(&mut _i . path);
+ // Skipped field _i . bang_token;
+ // Skipped field _i . ident;
+ // Skipped field _i . tokens;
+}
+
pub fn visit_meta_item_mut<V: VisitorMut + ?Sized>(_visitor: &mut V, _i: &mut MetaItem) {
use ::MetaItem::*;
match *_i {
@@ -1543,8 +1543,8 @@
Slice(ref mut _binding_0, ) => {
_visitor.visit_pat_slice_mut(&mut * _binding_0);
}
- Mac(ref mut _binding_0, ) => {
- _visitor.visit_mac_mut(&mut * _binding_0);
+ Macro(ref mut _binding_0, ) => {
+ _visitor.visit_macro_mut(&mut * _binding_0);
}
}
}
@@ -1704,7 +1704,7 @@
_visitor.visit_expr_mut(&mut * _binding_0);
// Skipped field * _binding_1;
}
- Mac(ref mut _binding_0, ) => {
+ Macro(ref mut _binding_0, ) => {
// Skipped field * _binding_0;
}
}
@@ -1733,7 +1733,7 @@
_visitor.visit_trait_item_type_mut(&mut * _binding_0);
}
Macro(ref mut _binding_0, ) => {
- _visitor.visit_trait_item_mac_mut(&mut * _binding_0);
+ _visitor.visit_trait_item_macro_mut(&mut * _binding_0);
}
}
}
@@ -1748,9 +1748,9 @@
// Skipped field _i . semi_token;
}
# [ cfg ( feature = "full" ) ]
-pub fn visit_trait_item_mac_mut<V: VisitorMut + ?Sized>(_visitor: &mut V, _i: &mut TraitItemMac) {
+pub fn visit_trait_item_macro_mut<V: VisitorMut + ?Sized>(_visitor: &mut V, _i: &mut TraitItemMacro) {
for mut it in (_i . attrs).iter_mut() { _visitor.visit_attribute_mut(&mut it) };
- _visitor.visit_mac_mut(&mut _i . mac);
+ _visitor.visit_macro_mut(&mut _i . mac);
}
# [ cfg ( feature = "full" ) ]
pub fn visit_trait_item_method_mut<V: VisitorMut + ?Sized>(_visitor: &mut V, _i: &mut TraitItemMethod) {
@@ -1812,8 +1812,8 @@
Infer(ref mut _binding_0, ) => {
_visitor.visit_ty_infer_mut(&mut * _binding_0);
}
- Mac(ref mut _binding_0, ) => {
- _visitor.visit_mac_mut(&mut * _binding_0);
+ Macro(ref mut _binding_0, ) => {
+ _visitor.visit_macro_mut(&mut * _binding_0);
}
}
}