Unify walk_generic_param

Author: maxcabrajac

compiler/rustc_ast/src/visitors.rs

@@ -1204,6 +1204,30 @@ macro_rules! make_ast_visitor {
             return_result!(V)
         }
 
+        pub fn walk_generic_param<$($lt,)? V: $trait$(<$lt>)?>(
+            vis: &mut V,
+            param: ref_t!(GenericParam)
+        ) -> result!(V) {
+            let GenericParam { id, ident, attrs, bounds, kind, colon_span, is_placeholder: _ } = param;
+            try_v!(visit_id!(vis, id));
+            visit_list!(vis, visit_attribute, flat_map_attribute, attrs);
+            try_v!(visit_ident!(vis, ident));
+            visit_list!(vis, visit_param_bound, bounds; BoundKind::Bound);
+            match kind {
+                GenericParamKind::Lifetime => {}
+                GenericParamKind::Type { default } => {
+                    visit_o!(default, |default| vis.visit_ty(default));
+                }
+                GenericParamKind::Const { ty, kw_span, default } => {
+                    try_v!(vis.visit_ty(ty));
+                    visit_o!(default, |default| vis.visit_anon_const(default));
+                    try_v!(visit_span!(vis, kw_span));
+                }
+            }
+            visit_o!(colon_span, |span| visit_span!(vis, span));
+            return_result!(V)
+        }
+
         derive_copy_clone!{
             #[derive(Debug)]
             pub enum FnKind<'a> {
@@ -1558,26 +1582,6 @@ pub mod visit {
         V::Result::output()
     }
 
-    pub fn walk_generic_param<'a, V: Visitor<'a>>(
-        visitor: &mut V,
-        param: &'a GenericParam,
-    ) -> V::Result {
-        let GenericParam { id: _, ident, attrs, bounds, is_placeholder: _, kind, colon_span: _ } =
-            param;
-        walk_list!(visitor, visit_attribute, attrs);
-        try_visit!(visitor.visit_ident(*ident));
-        walk_list!(visitor, visit_param_bound, bounds, BoundKind::Bound);
-        match kind {
-            GenericParamKind::Lifetime => (),
-            GenericParamKind::Type { default } => visit_opt!(visitor, visit_ty, default),
-            GenericParamKind::Const { ty, default, kw_span: _ } => {
-                try_visit!(visitor.visit_ty(ty));
-                visit_opt!(visitor, visit_anon_const, default);
-            }
-        }
-        V::Result::output()
-    }
-
     pub fn walk_where_predicate<'a, V: Visitor<'a>>(
         visitor: &mut V,
         predicate: &'a WherePredicate,
@@ -2292,27 +2296,6 @@ pub mod mut_visit {
         }
     }
 
-    pub fn walk_generic_param<T: MutVisitor>(vis: &mut T, param: &mut GenericParam) {
-        let GenericParam { id, ident, attrs, bounds, kind, colon_span, is_placeholder: _ } = param;
-        vis.visit_id(id);
-        visit_attrs(vis, attrs);
-        vis.visit_ident(ident);
-        visit_vec(bounds, |bound| vis.visit_param_bound(bound, BoundKind::Bound));
-        match kind {
-            GenericParamKind::Lifetime => {}
-            GenericParamKind::Type { default } => {
-                visit_opt(default, |default| vis.visit_ty(default));
-            }
-            GenericParamKind::Const { ty, kw_span: _, default } => {
-                vis.visit_ty(ty);
-                visit_opt(default, |default| vis.visit_anon_const(default));
-            }
-        }
-        if let Some(colon_span) = colon_span {
-            vis.visit_span(colon_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;