rustc_ast: visit_mac -> visit_mac_call

petrochenkov · petrochenkov · commit 90fafc8c8ff6 · 2020-11-03T23:39:51.000+03:00
diff --git a/compiler/rustc_ast/src/mut_visit.rs b/compiler/rustc_ast/src/mut_visit.rs
@@ -210,7 +210,7 @@ pub trait MutVisitor: Sized {
         noop_visit_local(l, self);
     }
 
-    fn visit_mac(&mut self, mac: &mut MacCall) {
+    fn visit_mac_call(&mut self, mac: &mut MacCall) {
         noop_visit_mac(mac, self);
     }
 
@@ -491,7 +491,7 @@ pub fn noop_visit_ty<T: MutVisitor>(ty: &mut P<Ty>, vis: &mut T) {
             vis.visit_id(id);
             visit_vec(bounds, |bound| vis.visit_param_bound(bound));
         }
-        TyKind::MacCall(mac) => vis.visit_mac(mac),
+        TyKind::MacCall(mac) => vis.visit_mac_call(mac),
     }
     vis.visit_span(span);
 }
@@ -943,7 +943,7 @@ pub fn noop_visit_item_kind<T: MutVisitor>(kind: &mut ItemKind, vis: &mut T) {
             vis.visit_generics(generics);
             visit_bounds(bounds, vis);
         }
-        ItemKind::MacCall(m) => vis.visit_mac(m),
+        ItemKind::MacCall(m) => vis.visit_mac_call(m),
         ItemKind::MacroDef(def) => vis.visit_macro_def(def),
     }
 }
@@ -972,7 +972,7 @@ pub fn noop_flat_map_assoc_item<T: MutVisitor>(
             visit_bounds(bounds, visitor);
             visit_opt(ty, |ty| visitor.visit_ty(ty));
         }
-        AssocItemKind::MacCall(mac) => visitor.visit_mac(mac),
+        AssocItemKind::MacCall(mac) => visitor.visit_mac_call(mac),
     }
     visitor.visit_span(span);
     smallvec![item]
@@ -1063,7 +1063,7 @@ pub fn noop_flat_map_foreign_item<T: MutVisitor>(
             visit_bounds(bounds, visitor);
             visit_opt(ty, |ty| visitor.visit_ty(ty));
         }
-        ForeignItemKind::MacCall(mac) => visitor.visit_mac(mac),
+        ForeignItemKind::MacCall(mac) => visitor.visit_mac_call(mac),
     }
     visitor.visit_span(span);
     smallvec![item]
@@ -1102,7 +1102,7 @@ pub fn noop_visit_pat<T: MutVisitor>(pat: &mut P<Pat>, vis: &mut T) {
             visit_vec(elems, |elem| vis.visit_pat(elem))
         }
         PatKind::Paren(inner) => vis.visit_pat(inner),
-        PatKind::MacCall(mac) => vis.visit_mac(mac),
+        PatKind::MacCall(mac) => vis.visit_mac_call(mac),
     }
     vis.visit_span(span);
 }
@@ -1267,7 +1267,7 @@ pub fn noop_visit_expr<T: MutVisitor>(
             }
             visit_vec(inputs, |(_c, expr)| vis.visit_expr(expr));
         }
-        ExprKind::MacCall(mac) => vis.visit_mac(mac),
+        ExprKind::MacCall(mac) => vis.visit_mac_call(mac),
         ExprKind::Struct(path, fields, expr) => {
             vis.visit_path(path);
             fields.flat_map_in_place(|field| vis.flat_map_field(field));
@@ -1328,7 +1328,7 @@ pub fn noop_flat_map_stmt_kind<T: MutVisitor>(
         StmtKind::Empty => smallvec![StmtKind::Empty],
         StmtKind::MacCall(mut mac) => {
             let MacCallStmt { mac: mac_, style: _, attrs } = mac.deref_mut();
-            vis.visit_mac(mac_);
+            vis.visit_mac_call(mac_);
             visit_thin_attrs(attrs, vis);
             smallvec![StmtKind::MacCall(mac)]
         }
diff --git a/compiler/rustc_ast/src/visit.rs b/compiler/rustc_ast/src/visit.rs
@@ -176,7 +176,7 @@ pub trait Visitor<'ast>: Sized {
     fn visit_lifetime(&mut self, lifetime: &'ast Lifetime) {
         walk_lifetime(self, lifetime)
     }
-    fn visit_mac(&mut self, mac: &'ast MacCall) {
+    fn visit_mac_call(&mut self, mac: &'ast MacCall) {
         walk_mac(self, mac)
     }
     fn visit_mac_def(&mut self, _mac: &'ast MacroDef, _id: NodeId) {
@@ -341,7 +341,7 @@ pub fn walk_item<'a, V: Visitor<'a>>(visitor: &mut V, item: &'a Item) {
             visitor.visit_generics(generics);
             walk_list!(visitor, visit_param_bound, bounds);
         }
-        ItemKind::MacCall(ref mac) => visitor.visit_mac(mac),
+        ItemKind::MacCall(ref mac) => visitor.visit_mac_call(mac),
         ItemKind::MacroDef(ref ts) => visitor.visit_mac_def(ts, item.id),
     }
     walk_list!(visitor, visit_attribute, &item.attrs);
@@ -409,7 +409,7 @@ pub fn walk_ty<'a, V: Visitor<'a>>(visitor: &mut V, typ: &'a Ty) {
         }
         TyKind::Typeof(ref expression) => visitor.visit_anon_const(expression),
         TyKind::Infer | TyKind::ImplicitSelf | TyKind::Err => {}
-        TyKind::MacCall(ref mac) => visitor.visit_mac(mac),
+        TyKind::MacCall(ref mac) => visitor.visit_mac_call(mac),
         TyKind::Never | TyKind::CVarArgs => {}
     }
 }
@@ -527,7 +527,7 @@ pub fn walk_pat<'a, V: Visitor<'a>>(visitor: &mut V, pattern: &'a Pat) {
         PatKind::Tuple(ref elems) | PatKind::Slice(ref elems) | PatKind::Or(ref elems) => {
             walk_list!(visitor, visit_pat, elems);
         }
-        PatKind::MacCall(ref mac) => visitor.visit_mac(mac),
+        PatKind::MacCall(ref mac) => visitor.visit_mac_call(mac),
     }
 }
 
@@ -552,7 +552,7 @@ pub fn walk_foreign_item<'a, V: Visitor<'a>>(visitor: &mut V, item: &'a ForeignI
             walk_list!(visitor, visit_ty, ty);
         }
         ForeignItemKind::MacCall(mac) => {
-            visitor.visit_mac(mac);
+            visitor.visit_mac_call(mac);
         }
     }
 }
@@ -657,7 +657,7 @@ pub fn walk_assoc_item<'a, V: Visitor<'a>>(visitor: &mut V, item: &'a AssocItem,
             walk_list!(visitor, visit_ty, ty);
         }
         AssocItemKind::MacCall(mac) => {
-            visitor.visit_mac(mac);
+            visitor.visit_mac_call(mac);
         }
     }
 }
@@ -687,7 +687,7 @@ pub fn walk_stmt<'a, V: Visitor<'a>>(visitor: &mut V, statement: &'a Stmt) {
         StmtKind::Empty => {}
         StmtKind::MacCall(ref mac) => {
             let MacCallStmt { ref mac, style: _, ref attrs } = **mac;
-            visitor.visit_mac(mac);
+            visitor.visit_mac_call(mac);
             for attr in attrs.iter() {
                 visitor.visit_attribute(attr);
             }
@@ -818,7 +818,7 @@ pub fn walk_expr<'a, V: Visitor<'a>>(visitor: &mut V, expression: &'a Expr) {
         ExprKind::Ret(ref optional_expression) => {
             walk_list!(visitor, visit_expr, optional_expression);
         }
-        ExprKind::MacCall(ref mac) => visitor.visit_mac(mac),
+        ExprKind::MacCall(ref mac) => visitor.visit_mac_call(mac),
         ExprKind::Paren(ref subexpression) => visitor.visit_expr(subexpression),
         ExprKind::InlineAsm(ref ia) => {
             for (op, _) in &ia.operands {
diff --git a/compiler/rustc_ast_passes/src/node_count.rs b/compiler/rustc_ast_passes/src/node_count.rs
@@ -114,7 +114,7 @@ impl<'ast> Visitor<'ast> for NodeCounter {
         self.count += 1;
         walk_lifetime(self, lifetime)
     }
-    fn visit_mac(&mut self, mac: &MacCall) {
+    fn visit_mac_call(&mut self, mac: &MacCall) {
         self.count += 1;
         walk_mac(self, mac)
     }
diff --git a/compiler/rustc_builtin_macros/src/deriving/generic/mod.rs b/compiler/rustc_builtin_macros/src/deriving/generic/mod.rs
@@ -358,7 +358,7 @@ fn find_type_parameters(
             visit::walk_ty(self, ty)
         }
 
-        fn visit_mac(&mut self, mac: &ast::MacCall) {
+        fn visit_mac_call(&mut self, mac: &ast::MacCall) {
             self.cx.span_err(mac.span(), "`derive` cannot be used on items with type macros");
         }
     }
diff --git a/compiler/rustc_expand/src/mbe/transcribe.rs b/compiler/rustc_expand/src/mbe/transcribe.rs
@@ -5,7 +5,6 @@ use crate::mbe::macro_parser::{MatchedNonterminal, MatchedSeq, NamedMatch};
 use rustc_ast::mut_visit::{self, MutVisitor};
 use rustc_ast::token::{self, NtTT, Token};
 use rustc_ast::tokenstream::{DelimSpan, TokenStream, TokenTree, TreeAndSpacing};
-use rustc_ast::MacCall;
 use rustc_data_structures::fx::FxHashMap;
 use rustc_data_structures::sync::Lrc;
 use rustc_errors::{pluralize, PResult};
diff --git a/compiler/rustc_expand/src/mut_visit/tests.rs b/compiler/rustc_expand/src/mut_visit/tests.rs
@@ -1,7 +1,7 @@
 use crate::tests::{matches_codepattern, string_to_crate};
 
 use rustc_ast as ast;
-use rustc_ast::mut_visit::{self, MutVisitor};
+use rustc_ast::mut_visit::MutVisitor;
 use rustc_ast_pretty::pprust;
 use rustc_span::symbol::Ident;
 use rustc_span::with_default_session_globals;
diff --git a/compiler/rustc_lint/src/early.rs b/compiler/rustc_lint/src/early.rs
@@ -270,7 +270,7 @@ impl<'a, T: EarlyLintPass> ast_visit::Visitor<'a> for EarlyContextAndPass<'a, T>
         self.check_id(id);
     }
 
-    fn visit_mac(&mut self, mac: &'a ast::MacCall) {
+    fn visit_mac_call(&mut self, mac: &'a ast::MacCall) {
         run_early_pass!(self, check_mac, mac);
         ast_visit::walk_mac(self, mac);
     }
diff --git a/compiler/rustc_parse/src/parser/pat.rs b/compiler/rustc_parse/src/parser/pat.rs
@@ -1,6 +1,6 @@
 use super::{Parser, PathStyle};
 use crate::{maybe_recover_from_interpolated_ty_qpath, maybe_whole};
-use rustc_ast::mut_visit::{noop_visit_mac, noop_visit_pat, MutVisitor};
+use rustc_ast::mut_visit::{noop_visit_pat, MutVisitor};
 use rustc_ast::ptr::P;
 use rustc_ast::token;
 use rustc_ast::{self as ast, AttrVec, Attribute, FieldPat, MacCall, Pat, PatKind, RangeEnd};
diff --git a/compiler/rustc_passes/src/hir_stats.rs b/compiler/rustc_passes/src/hir_stats.rs
@@ -336,7 +336,7 @@ impl<'v> ast_visit::Visitor<'v> for StatCollector<'v> {
         ast_visit::walk_lifetime(self, lifetime)
     }
 
-    fn visit_mac(&mut self, mac: &'v ast::MacCall) {
+    fn visit_mac_call(&mut self, mac: &'v ast::MacCall) {
         self.record("MacCall", Id::None, mac);
         ast_visit::walk_mac(self, mac)
     }
diff --git a/src/test/ui/parser/issue-65122-mac-invoc-in-mut-patterns.rs b/src/test/ui/parser/issue-65122-mac-invoc-in-mut-patterns.rs
@@ -1,4 +1,4 @@
-// Regression test; used to ICE with 'visit_mac disabled by default' due to a
+// Regression test; used to ICE with 'visit_mac_call disabled by default' due to a
 // `MutVisitor` in `fn make_all_value_bindings_mutable` (`parse/parser/pat.rs`).
 
 macro_rules! mac1 {
diff --git a/src/tools/clippy/clippy_lints/src/non_expressive_names.rs b/src/tools/clippy/clippy_lints/src/non_expressive_names.rs
@@ -1,6 +1,6 @@
 use crate::utils::{span_lint, span_lint_and_then};
 use rustc_ast::ast::{
-    Arm, AssocItem, AssocItemKind, Attribute, Block, FnDecl, Item, ItemKind, Local, MacCall, Pat, PatKind,
+    Arm, AssocItem, AssocItemKind, Attribute, Block, FnDecl, Item, ItemKind, Local, Pat, PatKind,
 };
 use rustc_ast::visit::{walk_block, walk_expr, walk_pat, Visitor};
 use rustc_lint::{EarlyContext, EarlyLintPass};

Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,7 @@ pub trait MutVisitor: Sized {`
`210`	`210`	`noop_visit_local(l, self);`
`211`	`211`	`}`
`212`	`212`
`213`		`- fn visit_mac(&mut self, mac: &mut MacCall) {`
	`213`	`+ fn visit_mac_call(&mut self, mac: &mut MacCall) {`
`214`	`214`	`noop_visit_mac(mac, self);`
`215`	`215`	`}`
`216`	`216`
`@@ -491,7 +491,7 @@ pub fn noop_visit_ty<T: MutVisitor>(ty: &mut P<Ty>, vis: &mut T) {`
`491`	`491`	`vis.visit_id(id);`
`492`	`492`	`visit_vec(bounds, \|bound\| vis.visit_param_bound(bound));`
`493`	`493`	`}`
`494`		`- TyKind::MacCall(mac) => vis.visit_mac(mac),`
	`494`	`+ TyKind::MacCall(mac) => vis.visit_mac_call(mac),`
`495`	`495`	`}`
`496`	`496`	`vis.visit_span(span);`
`497`	`497`	`}`
`@@ -943,7 +943,7 @@ pub fn noop_visit_item_kind<T: MutVisitor>(kind: &mut ItemKind, vis: &mut T) {`
`943`	`943`	`vis.visit_generics(generics);`
`944`	`944`	`visit_bounds(bounds, vis);`
`945`	`945`	`}`
`946`		`- ItemKind::MacCall(m) => vis.visit_mac(m),`
	`946`	`+ ItemKind::MacCall(m) => vis.visit_mac_call(m),`
`947`	`947`	`ItemKind::MacroDef(def) => vis.visit_macro_def(def),`
`948`	`948`	`}`
`949`	`949`	`}`
`@@ -972,7 +972,7 @@ pub fn noop_flat_map_assoc_item<T: MutVisitor>(`
`972`	`972`	`visit_bounds(bounds, visitor);`
`973`	`973`	`visit_opt(ty, \|ty\| visitor.visit_ty(ty));`
`974`	`974`	`}`
`975`		`- AssocItemKind::MacCall(mac) => visitor.visit_mac(mac),`
	`975`	`+ AssocItemKind::MacCall(mac) => visitor.visit_mac_call(mac),`
`976`	`976`	`}`
`977`	`977`	`visitor.visit_span(span);`
`978`	`978`	`smallvec![item]`
`@@ -1063,7 +1063,7 @@ pub fn noop_flat_map_foreign_item<T: MutVisitor>(`
`1063`	`1063`	`visit_bounds(bounds, visitor);`
`1064`	`1064`	`visit_opt(ty, \|ty\| visitor.visit_ty(ty));`
`1065`	`1065`	`}`
`1066`		`- ForeignItemKind::MacCall(mac) => visitor.visit_mac(mac),`
	`1066`	`+ ForeignItemKind::MacCall(mac) => visitor.visit_mac_call(mac),`
`1067`	`1067`	`}`
`1068`	`1068`	`visitor.visit_span(span);`
`1069`	`1069`	`smallvec![item]`
`@@ -1102,7 +1102,7 @@ pub fn noop_visit_pat<T: MutVisitor>(pat: &mut P<Pat>, vis: &mut T) {`
`1102`	`1102`	`visit_vec(elems, \|elem\| vis.visit_pat(elem))`
`1103`	`1103`	`}`
`1104`	`1104`	`PatKind::Paren(inner) => vis.visit_pat(inner),`
`1105`		`- PatKind::MacCall(mac) => vis.visit_mac(mac),`
	`1105`	`+ PatKind::MacCall(mac) => vis.visit_mac_call(mac),`
`1106`	`1106`	`}`
`1107`	`1107`	`vis.visit_span(span);`
`1108`	`1108`	`}`
`@@ -1267,7 +1267,7 @@ pub fn noop_visit_expr<T: MutVisitor>(`
`1267`	`1267`	`}`
`1268`	`1268`	`visit_vec(inputs, \|(_c, expr)\| vis.visit_expr(expr));`
`1269`	`1269`	`}`
`1270`		`- ExprKind::MacCall(mac) => vis.visit_mac(mac),`
	`1270`	`+ ExprKind::MacCall(mac) => vis.visit_mac_call(mac),`
`1271`	`1271`	`ExprKind::Struct(path, fields, expr) => {`
`1272`	`1272`	`vis.visit_path(path);`
`1273`	`1273`	`fields.flat_map_in_place(\|field\| vis.flat_map_field(field));`
`@@ -1328,7 +1328,7 @@ pub fn noop_flat_map_stmt_kind<T: MutVisitor>(`
`1328`	`1328`	`StmtKind::Empty => smallvec![StmtKind::Empty],`
`1329`	`1329`	`StmtKind::MacCall(mut mac) => {`
`1330`	`1330`	`let MacCallStmt { mac: mac_, style: _, attrs } = mac.deref_mut();`
`1331`		`- vis.visit_mac(mac_);`
	`1331`	`+ vis.visit_mac_call(mac_);`
`1332`	`1332`	`visit_thin_attrs(attrs, vis);`
`1333`	`1333`	`smallvec![StmtKind::MacCall(mac)]`
`1334`	`1334`	`}`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ pub trait Visitor<'ast>: Sized {`
`176`	`176`	`fn visit_lifetime(&mut self, lifetime: &'ast Lifetime) {`
`177`	`177`	`walk_lifetime(self, lifetime)`
`178`	`178`	`}`
`179`		`- fn visit_mac(&mut self, mac: &'ast MacCall) {`
	`179`	`+ fn visit_mac_call(&mut self, mac: &'ast MacCall) {`
`180`	`180`	`walk_mac(self, mac)`
`181`	`181`	`}`
`182`	`182`	`fn visit_mac_def(&mut self, _mac: &'ast MacroDef, _id: NodeId) {`
`@@ -341,7 +341,7 @@ pub fn walk_item<'a, V: Visitor<'a>>(visitor: &mut V, item: &'a Item) {`
`341`	`341`	`visitor.visit_generics(generics);`
`342`	`342`	`walk_list!(visitor, visit_param_bound, bounds);`
`343`	`343`	`}`
`344`		`- ItemKind::MacCall(ref mac) => visitor.visit_mac(mac),`
	`344`	`+ ItemKind::MacCall(ref mac) => visitor.visit_mac_call(mac),`
`345`	`345`	`ItemKind::MacroDef(ref ts) => visitor.visit_mac_def(ts, item.id),`
`346`	`346`	`}`
`347`	`347`	`walk_list!(visitor, visit_attribute, &item.attrs);`
`@@ -409,7 +409,7 @@ pub fn walk_ty<'a, V: Visitor<'a>>(visitor: &mut V, typ: &'a Ty) {`
`409`	`409`	`}`
`410`	`410`	`TyKind::Typeof(ref expression) => visitor.visit_anon_const(expression),`
`411`	`411`	`TyKind::Infer \| TyKind::ImplicitSelf \| TyKind::Err => {}`
`412`		`- TyKind::MacCall(ref mac) => visitor.visit_mac(mac),`
	`412`	`+ TyKind::MacCall(ref mac) => visitor.visit_mac_call(mac),`
`413`	`413`	`TyKind::Never \| TyKind::CVarArgs => {}`
`414`	`414`	`}`
`415`	`415`	`}`
`@@ -527,7 +527,7 @@ pub fn walk_pat<'a, V: Visitor<'a>>(visitor: &mut V, pattern: &'a Pat) {`
`527`	`527`	`PatKind::Tuple(ref elems) \| PatKind::Slice(ref elems) \| PatKind::Or(ref elems) => {`
`528`	`528`	`walk_list!(visitor, visit_pat, elems);`
`529`	`529`	`}`
`530`		`- PatKind::MacCall(ref mac) => visitor.visit_mac(mac),`
	`530`	`+ PatKind::MacCall(ref mac) => visitor.visit_mac_call(mac),`
`531`	`531`	`}`
`532`	`532`	`}`
`533`	`533`
`@@ -552,7 +552,7 @@ pub fn walk_foreign_item<'a, V: Visitor<'a>>(visitor: &mut V, item: &'a ForeignI`
`552`	`552`	`walk_list!(visitor, visit_ty, ty);`
`553`	`553`	`}`
`554`	`554`	`ForeignItemKind::MacCall(mac) => {`
`555`		`- visitor.visit_mac(mac);`
	`555`	`+ visitor.visit_mac_call(mac);`
`556`	`556`	`}`
`557`	`557`	`}`
`558`	`558`	`}`
`@@ -657,7 +657,7 @@ pub fn walk_assoc_item<'a, V: Visitor<'a>>(visitor: &mut V, item: &'a AssocItem,`
`657`	`657`	`walk_list!(visitor, visit_ty, ty);`
`658`	`658`	`}`
`659`	`659`	`AssocItemKind::MacCall(mac) => {`
`660`		`- visitor.visit_mac(mac);`
	`660`	`+ visitor.visit_mac_call(mac);`
`661`	`661`	`}`
`662`	`662`	`}`
`663`	`663`	`}`
`@@ -687,7 +687,7 @@ pub fn walk_stmt<'a, V: Visitor<'a>>(visitor: &mut V, statement: &'a Stmt) {`
`687`	`687`	`StmtKind::Empty => {}`
`688`	`688`	`StmtKind::MacCall(ref mac) => {`
`689`	`689`	`let MacCallStmt { ref mac, style: _, ref attrs } = **mac;`
`690`		`- visitor.visit_mac(mac);`
	`690`	`+ visitor.visit_mac_call(mac);`
`691`	`691`	`for attr in attrs.iter() {`
`692`	`692`	`visitor.visit_attribute(attr);`
`693`	`693`	`}`
`@@ -818,7 +818,7 @@ pub fn walk_expr<'a, V: Visitor<'a>>(visitor: &mut V, expression: &'a Expr) {`
`818`	`818`	`ExprKind::Ret(ref optional_expression) => {`
`819`	`819`	`walk_list!(visitor, visit_expr, optional_expression);`
`820`	`820`	`}`
`821`		`- ExprKind::MacCall(ref mac) => visitor.visit_mac(mac),`
	`821`	`+ ExprKind::MacCall(ref mac) => visitor.visit_mac_call(mac),`
`822`	`822`	`ExprKind::Paren(ref subexpression) => visitor.visit_expr(subexpression),`
`823`	`823`	`ExprKind::InlineAsm(ref ia) => {`
`824`	`824`	`for (op, _) in &ia.operands {`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ impl<'ast> Visitor<'ast> for NodeCounter {`
`114`	`114`	`self.count += 1;`
`115`	`115`	`walk_lifetime(self, lifetime)`
`116`	`116`	`}`
`117`		`- fn visit_mac(&mut self, mac: &MacCall) {`
	`117`	`+ fn visit_mac_call(&mut self, mac: &MacCall) {`
`118`	`118`	`self.count += 1;`
`119`	`119`	`walk_mac(self, mac)`
`120`	`120`	`}`
Original file line number	Diff line number	Diff line change
`@@ -358,7 +358,7 @@ fn find_type_parameters(`
`358`	`358`	`visit::walk_ty(self, ty)`
`359`	`359`	`}`
`360`	`360`
`361`		`- fn visit_mac(&mut self, mac: &ast::MacCall) {`
	`361`	`+ fn visit_mac_call(&mut self, mac: &ast::MacCall) {`
`362`	`362`	self.cx.span_err(mac.span(), "`derive` cannot be used on items with type macros");
`363`	`363`	`}`
`364`	`364`	`}`
Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,7 @@ impl<'a, T: EarlyLintPass> ast_visit::Visitor<'a> for EarlyContextAndPass<'a, T>`
`270`	`270`	`self.check_id(id);`
`271`	`271`	`}`
`272`	`272`
`273`		`- fn visit_mac(&mut self, mac: &'a ast::MacCall) {`
	`273`	`+ fn visit_mac_call(&mut self, mac: &'a ast::MacCall) {`
`274`	`274`	`run_early_pass!(self, check_mac, mac);`
`275`	`275`	`ast_visit::walk_mac(self, mac);`
`276`	`276`	`}`
Original file line number	Diff line number	Diff line change
`@@ -336,7 +336,7 @@ impl<'v> ast_visit::Visitor<'v> for StatCollector<'v> {`
`336`	`336`	`ast_visit::walk_lifetime(self, lifetime)`
`337`	`337`	`}`
`338`	`338`
`339`		`- fn visit_mac(&mut self, mac: &'v ast::MacCall) {`
	`339`	`+ fn visit_mac_call(&mut self, mac: &'v ast::MacCall) {`
`340`	`340`	`self.record("MacCall", Id::None, mac);`
`341`	`341`	`ast_visit::walk_mac(self, mac)`
`342`	`342`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Regression test; used to ICE with 'visit_mac disabled by default' due to a`
	`1`	`+// Regression test; used to ICE with 'visit_mac_call disabled by default' due to a`
`2`	`2`	// `MutVisitor` in `fn make_all_value_bindings_mutable` (`parse/parser/pat.rs`).
`3`	`3`
`4`	`4`	`macro_rules! mac1 {`