Unify walk_expr_field

Author: maxcabrajac

compiler/rustc_ast/src/visitors.rs

@@ -678,6 +678,19 @@ macro_rules! make_ast_visitor {
             return_result!(V)
         }
 
+        pub fn walk_expr_field<$($lt,)? V: $trait$(<$lt>)?>(
+            vis: &mut V,
+            f: ref_t!(ExprField)
+        ) -> result!(V) {
+            let ExprField { ident, expr, span, is_shorthand: _, attrs, id, is_placeholder: _ } = f;
+            try_v!(visit_id!(vis, id));
+            visit_list!(vis, visit_attribute, flat_map_attribute, attrs);
+            try_v!(visit_ident!(vis, ident));
+            try_v!(vis.visit_expr(expr));
+            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}
@@ -970,15 +983,6 @@ pub mod visit {
         V::Result::output()
     }
 
-    pub fn walk_expr_field<'a, V: Visitor<'a>>(visitor: &mut V, f: &'a ExprField) -> V::Result {
-        let ExprField { attrs, id: _, span: _, ident, expr, is_shorthand: _, is_placeholder: _ } =
-            f;
-        walk_list!(visitor, visit_attribute, attrs);
-        try_visit!(visitor.visit_ident(*ident));
-        try_visit!(visitor.visit_expr(expr));
-        V::Result::output()
-    }
-
     pub fn walk_ty<'a, V: Visitor<'a>>(visitor: &mut V, typ: &'a Ty) -> V::Result {
         let Ty { id, kind, span: _, tokens: _ } = typ;
         match kind {
@@ -2313,15 +2317,6 @@ pub mod mut_visit {
         visitor.visit_span(span);
     }
 
-    pub fn walk_expr_field<T: MutVisitor>(vis: &mut T, f: &mut ExprField) {
-        let ExprField { ident, expr, span, is_shorthand: _, attrs, id, is_placeholder: _ } = f;
-        vis.visit_id(id);
-        visit_attrs(vis, attrs);
-        vis.visit_ident(ident);
-        vis.visit_expr(expr);
-        vis.visit_span(span);
-    }
-
     pub fn walk_block<T: MutVisitor>(vis: &mut T, block: &mut P<Block>) {
         let Block { id, stmts, rules: _, span, tokens, could_be_bare_literal: _ } =
             block.deref_mut();