Unify walk_where_predicate

Author: maxcabrajac

compiler/rustc_ast/src/visitors.rs

@@ -1263,6 +1263,34 @@ macro_rules! make_ast_visitor {
             return_result!(V)
         }
 
+        pub fn walk_where_predicate<$($lt,)? V: $trait$(<$lt>)?>(
+            vis: &mut V,
+            predicate: ref_t!(WherePredicate)
+        ) -> result!(V) {
+            match predicate {
+                WherePredicate::BoundPredicate(bp) => {
+                    let WhereBoundPredicate { span, bound_generic_params, bounded_ty, bounds } = bp;
+                    visit_list!(vis, visit_generic_param, flat_map_generic_param, bound_generic_params);
+                    try_v!(vis.visit_ty(bounded_ty));
+                    visit_list!(vis, visit_param_bound, bounds; BoundKind::Bound);
+                    try_v!(visit_span!(vis, span));
+                }
+                WherePredicate::RegionPredicate(rp) => {
+                    let WhereRegionPredicate { span, lifetime, bounds } = rp;
+                    try_v!(vis.visit_lifetime(lifetime, LifetimeCtxt::Bound));
+                    visit_list!(vis, visit_param_bound, bounds; BoundKind::Bound);
+                    try_v!(visit_span!(vis, span));
+                }
+                WherePredicate::EqPredicate(ep) => {
+                    let WhereEqPredicate { span, lhs_ty, rhs_ty } = ep;
+                    try_v!(vis.visit_ty(lhs_ty));
+                    try_v!(vis.visit_ty(rhs_ty));
+                    try_v!(visit_span!(vis, span));
+                }
+            }
+            return_result!(V)
+        }
+
         derive_copy_clone!{
             #[derive(Debug)]
             pub enum FnKind<'a> {
@@ -1588,33 +1616,6 @@ pub mod visit {
 
     make_ast_visitor!(Visitor<'ast>);
 
-    pub fn walk_where_predicate<'a, V: Visitor<'a>>(
-        visitor: &mut V,
-        predicate: &'a WherePredicate,
-    ) -> V::Result {
-        match predicate {
-            WherePredicate::BoundPredicate(WhereBoundPredicate {
-                bounded_ty,
-                bounds,
-                bound_generic_params,
-                span: _,
-            }) => {
-                walk_list!(visitor, visit_generic_param, bound_generic_params);
-                try_visit!(visitor.visit_ty(bounded_ty));
-                walk_list!(visitor, visit_param_bound, bounds, BoundKind::Bound);
-            }
-            WherePredicate::RegionPredicate(WhereRegionPredicate { lifetime, bounds, span: _ }) => {
-                try_visit!(visitor.visit_lifetime(lifetime, LifetimeCtxt::Bound));
-                walk_list!(visitor, visit_param_bound, bounds, BoundKind::Bound);
-            }
-            WherePredicate::EqPredicate(WhereEqPredicate { lhs_ty, rhs_ty, span: _ }) => {
-                try_visit!(visitor.visit_ty(lhs_ty));
-                try_visit!(visitor.visit_ty(rhs_ty));
-            }
-        }
-        V::Result::output()
-    }
-
     pub fn walk_assoc_item<'a, V: Visitor<'a>>(
         visitor: &mut V,
         item: &'a Item<AssocItemKind>,
@@ -2289,30 +2290,6 @@ pub mod mut_visit {
         vis.visit_span(span_after);
     }
 
-    fn walk_where_predicate<T: MutVisitor>(vis: &mut T, pred: &mut WherePredicate) {
-        match pred {
-            WherePredicate::BoundPredicate(bp) => {
-                let WhereBoundPredicate { span, bound_generic_params, bounded_ty, bounds } = bp;
-                bound_generic_params.flat_map_in_place(|param| vis.flat_map_generic_param(param));
-                vis.visit_ty(bounded_ty);
-                visit_vec(bounds, |bound| vis.visit_param_bound(bound, BoundKind::Bound));
-                vis.visit_span(span);
-            }
-            WherePredicate::RegionPredicate(rp) => {
-                let WhereRegionPredicate { span, lifetime, bounds } = rp;
-                vis.visit_lifetime(lifetime, LifetimeCtxt::Bound);
-                visit_vec(bounds, |bound| vis.visit_param_bound(bound, BoundKind::Bound));
-                vis.visit_span(span);
-            }
-            WherePredicate::EqPredicate(ep) => {
-                let WhereEqPredicate { span, lhs_ty, rhs_ty } = ep;
-                vis.visit_ty(lhs_ty);
-                vis.visit_ty(rhs_ty);
-                vis.visit_span(span);
-            }
-        }
-    }
-
     fn visit_const_item<T: MutVisitor>(
         ConstItem { defaultness, generics, ty, expr }: &mut ConstItem,
         visitor: &mut T,