Unify walk_vis

Author: maxcabrajac

compiler/rustc_ast/src/visitors.rs

@@ -1019,6 +1019,23 @@ macro_rules! make_ast_visitor {
             return_result!(V)
         }
 
+        pub fn walk_vis<$($lt,)? V: $trait$(<$lt>)?>(
+            vis: &mut V,
+            visibility: ref_t!(Visibility)
+        ) -> result!(V) {
+            let Visibility { kind, span, tokens } = visibility;
+            match kind {
+                VisibilityKind::Public | VisibilityKind::Inherited => {}
+                VisibilityKind::Restricted { path, id, shorthand: _ } => {
+                    try_v!(visit_id!(vis, id));
+                    try_v!(vis.visit_path(path, *id));
+                }
+            }
+            visit_lazy_tts!(vis, tokens);
+            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}
@@ -1715,17 +1732,6 @@ pub mod visit {
         visitor.visit_expr_post(expression)
     }
 
-    pub fn walk_vis<'a, V: Visitor<'a>>(visitor: &mut V, vis: &'a Visibility) -> V::Result {
-        let Visibility { kind, span: _, tokens: _ } = vis;
-        match kind {
-            VisibilityKind::Restricted { path, id, shorthand: _ } => {
-                try_visit!(visitor.visit_path(path, *id));
-            }
-            VisibilityKind::Public | VisibilityKind::Inherited => {}
-        }
-        V::Result::output()
-    }
-
     pub fn walk_attribute<'a, V: Visitor<'a>>(visitor: &mut V, attr: &'a Attribute) -> V::Result {
         let Attribute { kind, id: _, style: _, span: _ } = attr;
         match kind {
@@ -2791,19 +2797,6 @@ pub mod mut_visit {
         }
     }
 
-    fn walk_vis<T: MutVisitor>(vis: &mut T, visibility: &mut Visibility) {
-        let Visibility { kind, span, tokens } = visibility;
-        match kind {
-            VisibilityKind::Public | VisibilityKind::Inherited => {}
-            VisibilityKind::Restricted { path, id, shorthand: _ } => {
-                vis.visit_id(id);
-                vis.visit_path(path, *id);
-            }
-        }
-        visit_lazy_tts(vis, tokens);
-        vis.visit_span(span);
-    }
-
     /// Some value for the AST node that is valid but possibly meaningless. Similar
     /// to `Default` but not intended for wide use. The value will never be used
     /// meaningfully, it exists just to support unwinding in `visit_clobber` in the