Unify {visit,walk}_precise_capturing_arg

Author: maxcabrajac

compiler/rustc_ast/src/visitors.rs

@@ -211,7 +211,6 @@ macro_rules! make_ast_visitor {
                 make_visit!{MacroDef; visit_macro_def, walk_macro_def}
                 make_visit!{MetaItem; visit_meta_item, walk_meta_item}
                 make_visit!{MetaItemInner; visit_meta_list_item, walk_meta_list_item}
-                make_visit!{PreciseCapturingArg; visit_precise_capturing_arg, walk_precise_capturing_arg}
 
                 fn flat_map_foreign_item(&mut self, ni: P<ForeignItem>) -> SmallVec<[P<ForeignItem>; 1]> {
                     walk_flat_map_item(self, ni)
@@ -305,9 +304,6 @@ macro_rules! make_ast_visitor {
                 fn visit_fn(&mut self, fk: FnKind<'ast>, _: Span, _: NodeId) -> Self::Result {
                     walk_fn(self, fk)
                 }
-                fn visit_precise_capturing_arg(&mut self, arg: &'ast PreciseCapturingArg) {
-                    walk_precise_capturing_arg(self, arg);
-                }
                 fn visit_mac_def(&mut self, _mac: &'ast MacroDef, _id: NodeId) -> Self::Result {
                     Self::Result::output()
                 }
@@ -349,6 +345,7 @@ macro_rules! make_ast_visitor {
             make_visit!{Path, _ id: NodeId; visit_path, walk_path}
             make_visit!{PathSegment; visit_path_segment, walk_path_segment}
             make_visit!{PolyTraitRef; visit_poly_trait_ref, walk_poly_trait_ref}
+            make_visit!{PreciseCapturingArg; visit_precise_capturing_arg, walk_precise_capturing_arg}
             make_visit!{TraitRef; visit_trait_ref, walk_trait_ref}
             make_visit!{UseTree, id: NodeId, _ nested: bool; visit_use_tree, walk_use_tree}
             make_visit!{Variant; visit_variant, walk_variant}
@@ -761,6 +758,22 @@ macro_rules! make_ast_visitor {
             return_result!(V)
         }
 
+        pub fn walk_precise_capturing_arg<$($lt,)? V: $trait$(<$lt>)?>(
+            vis: &mut V,
+            arg: ref_t!(PreciseCapturingArg)
+        ) -> result!(V) {
+            match arg {
+                PreciseCapturingArg::Lifetime(lt) => {
+                    try_v!(vis.visit_lifetime(lt, LifetimeCtxt::GenericArg));
+                }
+                PreciseCapturingArg::Arg(path, id) => {
+                    try_v!(visit_id!(vis, id));
+                    try_v!(vis.visit_path(path, *id));
+                }
+            }
+            return_result!(V)
+        }
+
         pub fn walk_use_tree<$($lt,)? V: $trait$(<$lt>)?>(
             vis: &mut V,
             use_tree: ref_t!(UseTree),
@@ -1259,20 +1272,6 @@ pub mod visit {
         }
     }
 
-    pub fn walk_precise_capturing_arg<'a, V: Visitor<'a>>(
-        visitor: &mut V,
-        arg: &'a PreciseCapturingArg,
-    ) {
-        match arg {
-            PreciseCapturingArg::Lifetime(lt) => {
-                visitor.visit_lifetime(lt, LifetimeCtxt::GenericArg);
-            }
-            PreciseCapturingArg::Arg(path, id) => {
-                visitor.visit_path(path, *id);
-            }
-        }
-    }
-
     pub fn walk_generic_param<'a, V: Visitor<'a>>(
         visitor: &mut V,
         param: &'a GenericParam,
@@ -2115,18 +2114,6 @@ pub mod mut_visit {
         }
     }
 
-    fn walk_precise_capturing_arg<T: MutVisitor>(vis: &mut T, arg: &mut PreciseCapturingArg) {
-        match arg {
-            PreciseCapturingArg::Lifetime(lt) => {
-                vis.visit_lifetime(lt, LifetimeCtxt::GenericArg);
-            }
-            PreciseCapturingArg::Arg(path, id) => {
-                vis.visit_id(id);
-                vis.visit_path(path, *id);
-            }
-        }
-    }
-
     pub fn walk_flat_map_generic_param<T: MutVisitor>(
         vis: &mut T,
         mut param: GenericParam,