Unify walk_param_bound

Author: maxcabrajac

compiler/rustc_ast/src/visitors.rs

@@ -897,6 +897,25 @@ macro_rules! make_ast_visitor {
             return_result!(V)
         }
 
+        pub fn walk_param_bound<$($lt,)? V: $trait$(<$lt>)?>(
+            vis: &mut V,
+            bound: ref_t!(GenericBound)
+        ) -> result!(V) {
+            match bound {
+                GenericBound::Trait(typ, _modifier) => {
+                    try_v!(vis.visit_poly_trait_ref(typ));
+                }
+                GenericBound::Outlives(lifetime) => {
+                    try_v!(vis.visit_lifetime(lifetime, LifetimeCtxt::Bound));
+                }
+                GenericBound::Use(args, span) => {
+                    visit_list!(vis, visit_precise_capturing_arg, args);
+                    try_v!(visit_span!(vis, span))
+                }
+            }
+            return_result!(V)
+        }
+
         make_walk_flat_map!{Arm, walk_flat_map_arm, visit_arm}
         make_walk_flat_map!{Attribute, walk_flat_map_attribute, visit_attribute}
         make_walk_flat_map!{ExprField, walk_flat_map_expr_field, visit_expr_field}
@@ -1308,22 +1327,6 @@ pub mod visit {
         }
     }
 
-    pub fn walk_param_bound<'a, V: Visitor<'a>>(
-        visitor: &mut V,
-        bound: &'a GenericBound,
-    ) -> V::Result {
-        match bound {
-            GenericBound::Trait(typ, _modifier) => visitor.visit_poly_trait_ref(typ),
-            GenericBound::Outlives(lifetime) => {
-                visitor.visit_lifetime(lifetime, LifetimeCtxt::Bound)
-            }
-            GenericBound::Use(args, _span) => {
-                walk_list!(visitor, visit_precise_capturing_arg, args);
-                V::Result::output()
-            }
-        }
-    }
-
     pub fn walk_precise_capturing_arg<'a, V: Visitor<'a>>(
         visitor: &mut V,
         arg: &'a PreciseCapturingArg,
@@ -2207,19 +2210,6 @@ pub mod mut_visit {
         }
     }
 
-    fn walk_param_bound<T: MutVisitor>(vis: &mut T, pb: &mut GenericBound) {
-        match pb {
-            GenericBound::Trait(ty, _modifier) => vis.visit_poly_trait_ref(ty),
-            GenericBound::Outlives(lifetime) => walk_lifetime(vis, lifetime),
-            GenericBound::Use(args, span) => {
-                for arg in args {
-                    vis.visit_precise_capturing_arg(arg);
-                }
-                vis.visit_span(span);
-            }
-        }
-    }
-
     fn walk_precise_capturing_arg<T: MutVisitor>(vis: &mut T, arg: &mut PreciseCapturingArg) {
         match arg {
             PreciseCapturingArg::Lifetime(lt) => {