Unify walk_variant_data

Author: maxcabrajac

compiler/rustc_ast/src/visitors.rs

@@ -296,6 +296,7 @@ macro_rules! make_ast_visitor {
             make_visit!{WhereClause, visit_where_clause, walk_where_clause}
             make_visit!{EnumDef, visit_enum_def, walk_enum_def}
             make_visit!{CaptureBy, visit_capture_by, walk_capture_by}
+            make_visit!{VariantData, visit_variant_data, walk_variant_data}
             make_visit!{P!(Local), visit_local, walk_local}
             make_visit!{P!(Pat), visit_pat, walk_pat}
             make_visit!{P!(Expr), visit_expr, walk_expr}
@@ -323,15 +324,6 @@ macro_rules! make_ast_visitor {
                 walk_precise_capturing_arg(self, arg);
             }
 
-            fn visit_variant_data(&mut self, vdata: ref_t!(VariantData)) -> result!() {
-                // FIXME: inconsistent naming
-                if_mut_expr!(
-                    walk_variant_data(self, vdata)
-                ,
-                    walk_struct_def(self, vdata)
-                )
-            }
-
             fn visit_variant_discr(&mut self, discr: ref_t!(AnonConst)) -> result!() {
                 self.visit_anon_const(discr)
             }
@@ -667,6 +659,25 @@ macro_rules! make_ast_visitor {
             return_result!(V)
         }
 
+        pub fn walk_variant_data<$($lt,)? V: $trait$(<$lt>)?>(
+            vis: &mut V,
+            vdata: ref_t!(VariantData)
+        ) -> result!(V) {
+            match vdata {
+                VariantData::Struct { fields, recovered: _ } => {
+                    visit_list!(vis, visit_field_def, flat_map_field_def, fields);
+                }
+                VariantData::Tuple(fields, id) => {
+                    try_v!(visit_id!(vis, id));
+                    visit_list!(vis, visit_field_def, flat_map_field_def, fields);
+                }
+                VariantData::Unit(id) => {
+                    try_v!(visit_id!(vis, id));
+                }
+            }
+            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}
@@ -1348,12 +1359,12 @@ pub mod visit {
         V::Result::output()
     }
 
+    // FIXME: Remove this function. Use walk_variant_data
     pub fn walk_struct_def<'a, V: Visitor<'a>>(
         visitor: &mut V,
         struct_definition: &'a VariantData,
     ) -> V::Result {
-        walk_list!(visitor, visit_field_def, struct_definition.fields());
-        V::Result::output()
+        walk_variant_data(visitor, struct_definition)
     }
 
     pub fn walk_field_def<'a, V: Visitor<'a>>(visitor: &mut V, field: &'a FieldDef) -> V::Result {
@@ -2287,19 +2298,6 @@ pub mod mut_visit {
         }
     }
 
-    fn walk_variant_data<T: MutVisitor>(vis: &mut T, vdata: &mut VariantData) {
-        match vdata {
-            VariantData::Struct { fields, recovered: _ } => {
-                fields.flat_map_in_place(|field| vis.flat_map_field_def(field));
-            }
-            VariantData::Tuple(fields, id) => {
-                vis.visit_id(id);
-                fields.flat_map_in_place(|field| vis.flat_map_field_def(field));
-            }
-            VariantData::Unit(id) => vis.visit_id(id),
-        }
-    }
-
     fn walk_trait_ref<T: MutVisitor>(vis: &mut T, TraitRef { path, ref_id }: &mut TraitRef) {
         vis.visit_id(ref_id);
         vis.visit_path(path);