From 46750d0409a9c3ba5214aa20ccb0c9bdbf09ea7e Mon Sep 17 00:00:00 2001
From: Vadim Petrochenkov <vadim.petrochenkov@gmail.com>
Date: Sat, 10 Oct 2015 03:28:40 +0300
Subject: Merge VariantData and VariantData_

---
 src/libsyntax/ext/build.rs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/libsyntax/ext')

diff --git a/src/libsyntax/ext/build.rs b/src/libsyntax/ext/build.rs
index 25657b9c6cc..9b06fbd0a0b 100644
--- a/src/libsyntax/ext/build.rs
+++ b/src/libsyntax/ext/build.rs
@@ -1002,18 +1002,17 @@ impl<'a> AstBuilder for ExtCtxt<'a> {
             }}
         }).collect();
 
-        let data_ = if fields.is_empty() {
-            ast::VariantData_::Unit
+        let vdata = if fields.is_empty() {
+            ast::VariantData::Unit(ast::DUMMY_NODE_ID)
         } else {
-            ast::VariantData_::Tuple(fields)
+            ast::VariantData::Tuple(fields, ast::DUMMY_NODE_ID)
         };
 
         respan(span,
                ast::Variant_ {
                    name: name,
                    attrs: Vec::new(),
-                   data: P(ast::VariantData { data_: data_,
-                                           id: ast::DUMMY_NODE_ID}),
+                   data: P(vdata),
                    disr_expr: None,
                })
     }
-- 
cgit 1.4.1-3-g733a5