Unify walk_trait_ref

Author: maxcabrajac

compiler/rustc_ast/src/visitors.rs

@@ -768,6 +768,16 @@ macro_rules! make_ast_visitor {
             return_result!(V)
         }
 
+        pub fn walk_trait_ref<$($lt,)? V: $trait$(<$lt>)?>(
+            vis: &mut V,
+            trait_ref: ref_t!(TraitRef)
+        ) -> result!(V) {
+            let TraitRef { path, ref_id } = trait_ref;
+            try_v!(visit_id!(vis, ref_id));
+            try_v!(vis.visit_path(path, *ref_id));
+            return_result!(V)
+        }
+
         pub fn walk_use_tree<$($lt,)? V: $trait$(<$lt>)?>(
             vis: &mut V,
             use_tree: ref_t!(UseTree),
@@ -997,14 +1007,6 @@ pub mod visit {
         V::Result::output()
     }
 
-    pub fn walk_trait_ref<'a, V: Visitor<'a>>(
-        visitor: &mut V,
-        trait_ref: &'a TraitRef,
-    ) -> V::Result {
-        let TraitRef { path, ref_id } = trait_ref;
-        visitor.visit_path(path, *ref_id)
-    }
-
     impl WalkItemKind for ItemKind {
         fn walk<'a, V: Visitor<'a>>(
             &'a self,
@@ -2142,11 +2144,6 @@ pub mod mut_visit {
         vis.visit_span(span_after);
     }
 
-    fn walk_trait_ref<T: MutVisitor>(vis: &mut T, TraitRef { path, ref_id }: &mut TraitRef) {
-        vis.visit_id(ref_id);
-        vis.visit_path(path, *ref_id);
-    }
-
     pub fn walk_flat_map_field_def<T: MutVisitor>(
         visitor: &mut T,
         mut fd: FieldDef,