commit e67902a72a5854b428a6bde5d65e27f75cc9f3b9
author David Tolnay <dtolnay@gmail.com> Thu Dec 28 22:12:00 2017 -0500
committer David Tolnay <dtolnay@gmail.com> Thu Dec 28 22:14:41 2017 -0500
tree c1c801a9f90f333335d4e70d5843522883dc2bcd
parent fcfb900cad42c3bef88bc561cc108b9611e3e842

Flatten discriminant into one field

src/data.rs

diff --git a/src/data.rs b/src/data.rs
index e872fb9..a860ce4 100644
--- a/src/data.rs
+++ b/src/data.rs
@@ -13,10 +13,8 @@
         /// Type of variant.
         pub data: VariantData,
 
-        pub eq_token: Option<Token![=]>,
-
         /// Explicit discriminant, e.g. `Foo = 1`
-        pub discriminant: Option<Expr>,
+        pub discriminant: Option<(Token![=], Expr)>,
     }
 }
 
@@ -210,8 +208,8 @@
             tokens.append_all(&self.attrs);
             self.ident.to_tokens(tokens);
             self.data.to_tokens(tokens);
-            if let Some(ref disc) = self.discriminant {
-                TokensOrDefault(&self.eq_token).to_tokens(tokens);
+            if let Some((ref eq_token, ref disc)) = self.discriminant {
+                eq_token.to_tokens(tokens);
                 disc.to_tokens(tokens);
             }
         }