Unify walk_mac_call

Author: maxcabrajac

compiler/rustc_ast/src/visitors.rs

@@ -333,7 +333,7 @@ macro_rules! make_ast_visitor {
             make_visit!{Label; visit_label, walk_label}
             make_visit!{Lifetime, _ ctxt: LifetimeCtxt; visit_lifetime, walk_lifetime}
             make_visit!{Local; visit_local, walk_local}
-            make_visit!{MacCall; visit_mac_call, walk_mac}
+            make_visit!{MacCall; visit_mac_call, walk_mac_call}
             make_visit!{MutTy; visit_mt, walk_mt}
             make_visit!{Option<P<QSelf>>; visit_qself, walk_qself}
             make_visit!{Param; visit_param, walk_param}
@@ -770,6 +770,16 @@ macro_rules! make_ast_visitor {
             return_result!(V)
         }
 
+        pub fn walk_mac_call<$($lt,)? V: $trait$(<$lt>)?>(
+            vis: &mut V,
+            mac: ref_t!(MacCall)
+        ) -> result!(V) {
+            let MacCall { path, args } = mac;
+            try_v!(vis.visit_path(path, DUMMY_NODE_ID));
+            visit_delim_args!(vis, args);
+            return_result!(V)
+        }
+
         pub fn walk_mt<$($lt,)? V: $trait$(<$lt>)?>(
             vis: &mut V,
             mt: ref_t!(MutTy)
@@ -1538,11 +1548,6 @@ pub mod visit {
         V::Result::output()
     }
 
-    pub fn walk_mac<'a, V: Visitor<'a>>(visitor: &mut V, mac: &'a MacCall) -> V::Result {
-        let MacCall { path, args: _ } = mac;
-        visitor.visit_path(path, DUMMY_NODE_ID)
-    }
-
     pub fn walk_expr<'a, V: Visitor<'a>>(visitor: &mut V, expression: &'a Expr) -> V::Result {
         let Expr { id, kind, span, attrs, tokens: _ } = expression;
         walk_list!(visitor, visit_attribute, attrs);
@@ -1873,12 +1878,6 @@ pub mod mut_visit {
         vis.visit_span(span);
     }
 
-    fn walk_mac<T: MutVisitor>(vis: &mut T, mac: &mut MacCall) {
-        let MacCall { path, args } = mac;
-        vis.visit_path(path, DUMMY_NODE_ID);
-        visit_delim_args(vis, args);
-    }
-
     fn walk_macro_def<T: MutVisitor>(vis: &mut T, macro_def: &mut MacroDef) {
         let MacroDef { body, macro_rules: _ } = macro_def;
         visit_delim_args(vis, body);

compiler/rustc_ast_passes/src/node_count.rs

@@ -105,7 +105,7 @@ impl<'ast> Visitor<'ast> for NodeCounter {
     }
     fn visit_mac_call(&mut self, mac: &MacCall) {
         self.count += 1;
-        walk_mac(self, mac)
+        walk_mac_call(self, mac)
     }
     fn visit_path(&mut self, path: &Path, _id: NodeId) {
         self.count += 1;

compiler/rustc_lint/src/early.rs

@@ -296,7 +296,7 @@ impl<'a, T: EarlyLintPass> ast_visit::Visitor<'a> for EarlyContextAndPass<'a, T>
 
     fn visit_mac_call(&mut self, mac: &'a ast::MacCall) {
         lint_callback!(self, check_mac, mac);
-        ast_visit::walk_mac(self, mac);
+        ast_visit::walk_mac_call(self, mac);
     }
 }