Unify walk_fn

Author: maxcabrajac

compiler/rustc_ast/src/visitors.rs

@@ -1045,6 +1045,28 @@ macro_rules! make_ast_visitor {
             return_result!(V)
         }
 
+        pub fn walk_fn<$($lt,)? V: $trait$(<$lt>)?>(
+            visitor: &mut V,
+            kind: fn_kind!()
+        ) -> result!(V) {
+            match kind {
+                FnKind::Fn(_ctxt, _ident, FnSig { header, decl, span }, _vis, generics, body) => {
+                    // Identifier and visibility are visited as a part of the item.
+                    try_v!(visitor.visit_fn_header(header));
+                    try_v!(visitor.visit_generics(generics));
+                    try_v!(visitor.visit_fn_decl(decl));
+                    visit_o!(body, |body| visitor.visit_block(body));
+                    try_v!(visit_span!(visitor, span))
+                }
+                FnKind::Closure(binder, decl, body) => {
+                    try_v!(visitor.visit_closure_binder(binder));
+                    try_v!(visitor.visit_fn_decl(decl));
+                    try_v!(visitor.visit_expr(body));
+                }
+            }
+            return_result!(V)
+        }
+
         derive_copy_clone!{
             #[derive(Debug)]
             pub enum FnKind<'a> {
@@ -1457,24 +1479,6 @@ pub mod visit {
         V::Result::output()
     }
 
-    pub fn walk_fn<'a, V: Visitor<'a>>(visitor: &mut V, kind: FnKind<'a>) -> V::Result {
-        match kind {
-            FnKind::Fn(_ctxt, _ident, FnSig { header, decl, span: _ }, _vis, generics, body) => {
-                // Identifier and visibility are visited as a part of the item.
-                try_visit!(visitor.visit_fn_header(header));
-                try_visit!(visitor.visit_generics(generics));
-                try_visit!(visitor.visit_fn_decl(decl));
-                visit_opt!(visitor, visit_block, body);
-            }
-            FnKind::Closure(binder, decl, body) => {
-                try_visit!(visitor.visit_closure_binder(binder));
-                try_visit!(visitor.visit_fn_decl(decl));
-                try_visit!(visitor.visit_expr(body));
-            }
-        }
-        V::Result::output()
-    }
-
     pub fn walk_assoc_item<'a, V: Visitor<'a>>(
         visitor: &mut V,
         item: &'a Item<AssocItemKind>,
@@ -2221,26 +2225,6 @@ pub mod mut_visit {
         }
     }
 
-    fn walk_fn<T: MutVisitor>(vis: &mut T, kind: FnKind<'_>) {
-        match kind {
-            FnKind::Fn(_, _, FnSig { header, decl, span }, _, generics, body) => {
-                // Identifier and visibility are visited as a part of the item.
-                vis.visit_fn_header(header);
-                vis.visit_generics(generics);
-                vis.visit_fn_decl(decl);
-                if let Some(body) = body {
-                    vis.visit_block(body);
-                }
-                vis.visit_span(span);
-            }
-            FnKind::Closure(binder, decl, body) => {
-                vis.visit_closure_binder(binder);
-                vis.visit_fn_decl(decl);
-                vis.visit_expr(body);
-            }
-        }
-    }
-
     pub fn walk_generic_param<T: MutVisitor>(vis: &mut T, param: &mut GenericParam) {
         let GenericParam { id, ident, attrs, bounds, kind, colon_span, is_placeholder: _ } = param;
         vis.visit_id(id);