Unify walk_generic_argz

Author: maxcabrajac

compiler/rustc_ast/src/visitors.rs

@@ -515,6 +515,18 @@ macro_rules! make_ast_visitor {
             return_result!(V)
         }
 
+        pub fn walk_generic_arg<$($lt,)? V: $trait$(<$lt>)?>(
+            vis: &mut V,
+            arg: ref_t!(GenericArg)
+        ) -> result!(V) {
+            match arg {
+                GenericArg::Lifetime(lt) => try_v!(vis.visit_lifetime(lt, LifetimeCtxt::GenericArg)),
+                GenericArg::Type(ty) => try_v!(vis.visit_ty(ty)),
+                GenericArg::Const(ct) => try_v!(vis.visit_anon_const(ct)),
+            }
+            return_result!(V)
+        }
+
         pub fn walk_generic_args<$($lt,)? V: $trait$(<$lt>)?>(
             vis: &mut V,
             generic_args: ref_t!(GenericArgs)
@@ -1130,17 +1142,6 @@ pub mod visit {
         V::Result::output()
     }
 
-    pub fn walk_generic_arg<'a, V>(visitor: &mut V, generic_arg: &'a GenericArg) -> V::Result
-    where
-        V: Visitor<'a>,
-    {
-        match generic_arg {
-            GenericArg::Lifetime(lt) => visitor.visit_lifetime(lt, LifetimeCtxt::GenericArg),
-            GenericArg::Type(ty) => visitor.visit_ty(ty),
-            GenericArg::Const(ct) => visitor.visit_anon_const(ct),
-        }
-    }
-
     pub fn walk_assoc_item_constraint<'a, V: Visitor<'a>>(
         visitor: &mut V,
         constraint: &'a AssocItemConstraint,
@@ -1846,14 +1847,6 @@ pub mod mut_visit {
         smallvec![variant]
     }
 
-    fn walk_generic_arg<T: MutVisitor>(vis: &mut T, arg: &mut GenericArg) {
-        match arg {
-            GenericArg::Lifetime(lt) => vis.visit_lifetime(lt, LifetimeCtxt::GenericArg),
-            GenericArg::Type(ty) => vis.visit_ty(ty),
-            GenericArg::Const(ct) => vis.visit_anon_const(ct),
-        }
-    }
-
     fn walk_attribute<T: MutVisitor>(vis: &mut T, attr: &mut Attribute) {
         let Attribute { kind, id: _, style: _, span } = attr;
         match kind {