Unify walk_generic_args

Author: maxcabrajac

compiler/rustc_ast/src/visitors.rs

@@ -370,6 +370,24 @@ macro_rules! make_ast_visitor {
             return_result!(V)
         }
 
+        pub fn walk_generic_args<$($lt,)? V: $trait$(<$lt>)?>(
+            vis: &mut V,
+            generic_args: ref_t!(GenericArgs)
+        ) -> result!(V) {
+            match generic_args {
+                GenericArgs::AngleBracketed(data) => {
+                    try_v!(vis.visit_angle_bracketed_parameter_data(data));
+                }
+                GenericArgs::Parenthesized(data) => {
+                    try_v!(vis.visit_parenthesized_parameter_data(data));
+                }
+                GenericArgs::ParenthesizedElided(span) => {
+                    try_v!(visit_span!(vis, span));
+                }
+            }
+            return_result!(V)
+        }
+
         pub fn walk_ident<$($lt,)? V: $trait$(<$lt>)?>(
             vis: &mut V,
             ident: ref_t!(Ident)
@@ -819,22 +837,6 @@ pub mod visit {
         V::Result::output()
     }
 
-    pub fn walk_generic_args<'a, V>(visitor: &mut V, generic_args: &'a GenericArgs) -> V::Result
-    where
-        V: Visitor<'a>,
-    {
-        match generic_args {
-            GenericArgs::AngleBracketed(args) => {
-                try_visit!(visitor.visit_angle_bracketed_parameter_data(args));
-            }
-            GenericArgs::Parenthesized(args) => {
-                try_visit!(visitor.visit_parenthesized_parameter_data(args));
-            }
-            GenericArgs::ParenthesizedElided(_span) => {}
-        }
-        V::Result::output()
-    }
-
     pub fn walk_generic_arg<'a, V>(visitor: &mut V, generic_arg: &'a GenericArg) -> V::Result
     where
         V: Visitor<'a>,
@@ -1762,14 +1764,6 @@ pub mod mut_visit {
         })
     }
 
-    fn walk_generic_args<T: MutVisitor>(vis: &mut T, generic_args: &mut GenericArgs) {
-        match generic_args {
-            GenericArgs::AngleBracketed(data) => vis.visit_angle_bracketed_parameter_data(data),
-            GenericArgs::Parenthesized(data) => vis.visit_parenthesized_parameter_data(data),
-            GenericArgs::ParenthesizedElided(span) => vis.visit_span(span),
-        }
-    }
-
     fn walk_generic_arg<T: MutVisitor>(vis: &mut T, arg: &mut GenericArg) {
         match arg {
             GenericArg::Lifetime(lt) => vis.visit_lifetime(lt, LifetimeCtxt::GenericArg),