Unify FnKind

Author: maxcabrajac

compiler/rustc_ast/src/visitors.rs

@@ -139,6 +139,13 @@ macro_rules! mutability_helpers {
             };
             ($a: expr) => {};
         }
+
+        macro_rules! derive_copy_clone {
+            ($i: item) => {
+                #[derive(Copy, Clone)]
+                $i
+            }
+        }
     };
     (mut) => {
         macro_rules! if_mut_ty {
@@ -170,6 +177,12 @@ macro_rules! mutability_helpers {
                 $a
             };
         }
+
+        macro_rules! derive_copy_clone {
+            ($i: item) => {
+                $i
+            }
+        }
     };
 }
 
@@ -1032,6 +1045,17 @@ macro_rules! make_ast_visitor {
             return_result!(V)
         }
 
+        derive_copy_clone!{
+            #[derive(Debug)]
+            pub enum FnKind<'a> {
+                /// E.g., `fn foo()`, `fn foo(&self)`, or `extern "Abi" fn foo()`.
+                Fn(FnCtxt, Ident, &'a $($mut)? FnSig, &'a $($mut)? Visibility, &'a $($mut)? Generics, Option<&'a $($mut)? Block>),
+
+                /// E.g., `|x, y| body`.
+                Closure(&'a $($mut)? ClosureBinder, &'a $($mut)? P!(FnDecl), &'a $($mut)? P!(Expr)),
+            }
+        }
+
         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}
@@ -1111,15 +1135,6 @@ pub mod visit {
         }
     }
 
-    #[derive(Copy, Clone, Debug)]
-    pub enum FnKind<'a> {
-        /// E.g., `fn foo()`, `fn foo(&self)`, or `extern "Abi" fn foo()`.
-        Fn(FnCtxt, Ident, &'a FnSig, &'a Visibility, &'a Generics, Option<&'a Block>),
-
-        /// E.g., `|x, y| body`.
-        Closure(&'a ClosureBinder, &'a FnDecl, &'a Expr),
-    }
-
     impl<'a> FnKind<'a> {
         pub fn header(&self) -> Option<&'a FnHeader> {
             match *self {
@@ -1783,7 +1798,7 @@ pub mod mut_visit {
     use crate::ptr::P;
     use crate::token::{self, Token};
     use crate::tokenstream::*;
-    use crate::visit::{AssocCtxt, BoundKind, LifetimeCtxt};
+    use crate::visit::{AssocCtxt, BoundKind, LifetimeCtxt, FnCtxt};
 
     pub trait ExpectOne<A: Array> {
         fn expect_one(self, err: &'static str) -> A::Item;
@@ -2223,7 +2238,7 @@ pub mod mut_visit {
 
     fn walk_fn<T: MutVisitor>(vis: &mut T, kind: FnKind<'_>) {
         match kind {
-            FnKind::Fn(FnSig { header, decl, span }, generics, body) => {
+            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);
@@ -2299,8 +2314,8 @@ pub mod mut_visit {
             &mut self,
             id: NodeId,
             span: Span,
-            _vis: &mut Visibility,
-            _ident: &mut Ident,
+            vis: &mut Visibility,
+            ident: &mut Ident,
             visitor: &mut impl MutVisitor
         ) {
             match self {
@@ -2315,7 +2330,9 @@ pub mod mut_visit {
                 }
                 ItemKind::Fn(box Fn { defaultness, generics, sig, body }) => {
                     visit_defaultness(visitor, defaultness);
-                    visitor.visit_fn(FnKind::Fn(sig, generics, body), span, id);
+                    let kind =
+                        FnKind::Fn(FnCtxt::Free, *ident, sig, vis, generics, body.as_deref_mut());
+                    visitor.visit_fn(kind, span, id);
                 }
                 ItemKind::Mod(safety, mod_kind) => {
                     visit_safety(visitor, safety);
@@ -2457,7 +2474,7 @@ pub mod mut_visit {
         smallvec![item]
     }
 
-    pub fn walk_assoc_item(visitor: &mut impl MutVisitor, item: &mut Item<AssocItemKind>, _ctxt: AssocCtxt) {
+    pub fn walk_assoc_item(visitor: &mut impl MutVisitor, item: &mut Item<AssocItemKind>, ctxt: AssocCtxt) {
         let Item { attrs, id, span, vis, ident, kind, tokens } = item;
         visitor.visit_id(id);
         visit_attrs(visitor, attrs);
@@ -2469,7 +2486,9 @@ pub mod mut_visit {
             }
             AssocItemKind::Fn(box Fn { defaultness, generics, sig, body }) => {
                 visit_defaultness(visitor, defaultness);
-                visitor.visit_fn(FnKind::Fn(sig, generics, body), *span, *id);
+                let kind =
+                    FnKind::Fn(FnCtxt::Assoc(ctxt), *ident, sig, vis, generics, body.as_deref_mut());
+                visitor.visit_fn(kind, *span, *id);
             }
             AssocItemKind::Type(box TyAlias {
                 defaultness,
@@ -2543,8 +2562,8 @@ pub mod mut_visit {
             &mut self,
             id: NodeId,
             span: Span,
-            _vis: &mut Visibility,
-            _ident: &mut Ident,
+            vis: &mut Visibility,
+            ident: &mut Ident,
             visitor: &mut impl MutVisitor) {
             match self {
                 ForeignItemKind::Static(box StaticItem { ty, mutability: _, expr, safety: _ }) => {
@@ -2553,7 +2572,9 @@ pub mod mut_visit {
                 }
                 ForeignItemKind::Fn(box Fn { defaultness, generics, sig, body }) => {
                     visit_defaultness(visitor, defaultness);
-                    visitor.visit_fn(FnKind::Fn(sig, generics, body), span, id);
+                    let kind =
+                        FnKind::Fn(FnCtxt::Foreign, *ident, sig, vis, generics, body.as_deref_mut());
+                    visitor.visit_fn(kind, span, id);
                 }
                 ForeignItemKind::TyAlias(box TyAlias {
                     defaultness,
@@ -2910,13 +2931,4 @@ pub mod mut_visit {
             crate::ast_traits::AstNodeWrapper::new(N::dummy(), T::dummy())
         }
     }
-
-    #[derive(Debug)]
-    pub enum FnKind<'a> {
-        /// E.g., `fn foo()`, `fn foo(&self)`, or `extern "Abi" fn foo()`.
-        Fn(&'a mut FnSig, &'a mut Generics, &'a mut Option<P<Block>>),
-
-        /// E.g., `|x, y| body`.
-        Closure(&'a mut ClosureBinder, &'a mut P<FnDecl>, &'a mut P<Expr>),
-    }
 }