Unify walk_assoc_item_constraint

Author: maxcabrajac

compiler/rustc_ast/src/visitors.rs

@@ -1236,6 +1236,33 @@ macro_rules! make_ast_visitor {
             return_result!(V)
         }
 
+        pub fn walk_assoc_item_constraint<$($lt,)? V: $trait$(<$lt>)?>(
+            vis: &mut V,
+            constraint: ref_t!(AssocItemConstraint)
+        ) -> result!(V) {
+            let AssocItemConstraint { id, ident, gen_args, kind, span } = constraint;
+            try_v!(visit_id!(vis, id));
+            try_v!(visit_ident!(vis, ident));
+            visit_o!(gen_args, |gen_args| vis.visit_generic_args(gen_args));
+            match kind {
+                AssocItemConstraintKind::Equality { term } => {
+                    match term {
+                        Term::Ty(ty) => {
+                            try_v!(vis.visit_ty(ty));
+                        }
+                        Term::Const(c) => {
+                            try_v!(vis.visit_anon_const(c));
+                        }
+                    }
+                }
+                AssocItemConstraintKind::Bound { bounds } => {
+                    visit_list!(vis, visit_param_bound, bounds; BoundKind::Bound);
+                }
+            }
+            try_v!(visit_span!(vis, span));
+            return_result!(V)
+        }
+
         derive_copy_clone!{
             #[derive(Debug)]
             pub enum FnKind<'a> {
@@ -1561,25 +1588,6 @@ pub mod visit {
 
     make_ast_visitor!(Visitor<'ast>);
 
-    pub fn walk_assoc_item_constraint<'a, V: Visitor<'a>>(
-        visitor: &mut V,
-        constraint: &'a AssocItemConstraint,
-    ) -> V::Result {
-        let AssocItemConstraint { id: _, ident, gen_args, kind, span: _ } = constraint;
-        try_visit!(visitor.visit_ident(*ident));
-        visit_opt!(visitor, visit_generic_args, gen_args);
-        match kind {
-            AssocItemConstraintKind::Equality { term } => match term {
-                Term::Ty(ty) => try_visit!(visitor.visit_ty(ty)),
-                Term::Const(c) => try_visit!(visitor.visit_anon_const(c)),
-            },
-            AssocItemConstraintKind::Bound { bounds } => {
-                walk_list!(visitor, visit_param_bound, bounds, BoundKind::Bound);
-            }
-        }
-        V::Result::output()
-    }
-
     pub fn walk_where_predicate<'a, V: Visitor<'a>>(
         visitor: &mut V,
         predicate: &'a WherePredicate,
@@ -2030,27 +2038,6 @@ pub mod mut_visit {
         vis.visit_span(close);
     }
 
-    fn walk_assoc_item_constraint<T: MutVisitor>(
-        vis: &mut T,
-        AssocItemConstraint { id, ident, gen_args, kind, span }: &mut AssocItemConstraint,
-    ) {
-        vis.visit_id(id);
-        vis.visit_ident(ident);
-        if let Some(gen_args) = gen_args {
-            vis.visit_generic_args(gen_args);
-        }
-        match kind {
-            AssocItemConstraintKind::Equality { term } => match term {
-                Term::Ty(ty) => vis.visit_ty(ty),
-                Term::Const(c) => vis.visit_anon_const(c),
-            },
-            AssocItemConstraintKind::Bound { bounds } => {
-                visit_bounds(vis, bounds, BoundKind::Bound)
-            }
-        }
-        vis.visit_span(span);
-    }
-
     fn walk_foreign_mod<T: MutVisitor>(vis: &mut T, foreign_mod: &mut ForeignMod) {
         let ForeignMod { safety, abi: _, items } = foreign_mod;
         visit_safety(vis, safety);