Unify walk_generics

Author: maxcabrajac

compiler/rustc_ast/src/visitors.rs

@@ -579,6 +579,17 @@ macro_rules! make_ast_visitor {
             return_result!(V)
         }
 
+        pub fn walk_generics<$($lt,)? V: $trait$(<$lt>)?>(
+            vis: &mut V,
+            generics: ref_t!(Generics)
+        ) -> result!(V) {
+            let Generics { params, where_clause, span } = generics;
+            visit_list!(vis, visit_generic_param, flat_map_generic_param, params);
+            try_v!(vis.visit_where_clause(where_clause));
+            try_v!(visit_span!(vis, span));
+            return_result!(V)
+        }
+
         make_walk_flat_map!{Arm, walk_flat_map_arm, visit_arm}
         make_walk_flat_map!{ExprField, walk_flat_map_expr_field, visit_expr_field}
         make_walk_flat_map!{FieldDef, walk_flat_map_field_def, visit_field_def}
@@ -1153,13 +1164,6 @@ pub mod visit {
         V::Result::output()
     }
 
-    pub fn walk_generics<'a, V: Visitor<'a>>(visitor: &mut V, generics: &'a Generics) -> V::Result {
-        let Generics { params, where_clause, span: _ } = generics;
-        walk_list!(visitor, visit_generic_param, params);
-        try_visit!(visitor.visit_where_clause(where_clause));
-        V::Result::output()
-    }
-
     pub fn walk_where_predicate<'a, V: Visitor<'a>>(
         visitor: &mut V,
         predicate: &'a WherePredicate,
@@ -2244,13 +2248,6 @@ pub mod mut_visit {
         }
     }
 
-    fn walk_generics<T: MutVisitor>(vis: &mut T, generics: &mut Generics) {
-        let Generics { params, where_clause, span } = generics;
-        params.flat_map_in_place(|param| vis.flat_map_generic_param(param));
-        vis.visit_where_clause(where_clause);
-        vis.visit_span(span);
-    }
-
     fn walk_ty_alias_where_clauses<T: MutVisitor>(vis: &mut T, tawcs: &mut TyAliasWhereClauses) {
         let TyAliasWhereClauses { before, after, split: _ } = tawcs;
         let TyAliasWhereClause { has_where_token: _, span: span_before } = before;