Merge struct fields and struct kind

1 files changed, 10 insertions, 3 deletions

diff --git a/src/libsyntax/fold.rs b/src/libsyntax/fold.rs
index d7b7fc242b4..329ffb286eb 100644
--- a/src/libsyntax/fold.rs
+++ b/src/libsyntax/fold.rs
@@ -815,10 +815,17 @@ pub fn noop_fold_where_predicate<T: Folder>(
 }
 
 pub fn noop_fold_struct_def<T: Folder>(struct_def: P<VariantData>, fld: &mut T) -> P<VariantData> {
-    struct_def.map(|VariantData { fields, id, kind }| VariantData {
-        fields: fields.move_map(|f| fld.fold_struct_field(f)),
+    struct_def.map(|VariantData { data_, id }| VariantData {
+        data_: match data_ {
+            ast::VariantData_::Struct(fields) => {
+                ast::VariantData_::Struct(fields.move_map(|f| fld.fold_struct_field(f)))
+            }
+            ast::VariantData_::Tuple(fields) => {
+                ast::VariantData_::Tuple(fields.move_map(|f| fld.fold_struct_field(f)))
+            }
+            ast::VariantData_::Unit => ast::VariantData_::Unit
+        },
         id: fld.new_id(id),
-        kind: kind,
     })
 }