Merge pull request rust-lang#22512 from kupiakos/unnamed-enum-variants

Parse unnamed enum variants

Author: ChayimFriedman2

crates/parser/src/grammar/items/adt.rs

@@ -87,24 +87,27 @@ pub(crate) fn variant_list(p: &mut Parser<'_>) {
         attributes::outer_attrs(p);
         if p.at(IDENT) {
             name(p);
-            match p.current() {
-                T!['{'] => record_field_list(p),
-                T!['('] => tuple_field_list(p),
-                _ => (),
-            }
-
-            // test variant_discriminant
-            // enum E { X(i32) = 10 }
-            if p.eat(T![=]) {
-                let m = p.start();
-                expressions::expr(p);
-                m.complete(p, CONST_ARG);
-            }
-            m.complete(p, VARIANT);
+        } else if p.at(T![_]) {
+            p.bump(T![_]);
         } else {
             m.abandon(p);
             p.err_and_bump("expected enum variant");
+            return;
+        }
+        match p.current() {
+            T!['{'] => record_field_list(p),
+            T!['('] => tuple_field_list(p),
+            _ => (),
+        }
+
+        // test variant_discriminant
+        // enum E { X(i32) = 10 }
+        if p.eat(T![=]) {
+            let m = p.start();
+            expressions::expr(p);
+            m.complete(p, CONST_ARG);
         }
+        m.complete(p, VARIANT);
     }
 }
 

crates/parser/test_data/parser/ok/0019_enums.rast

@@ -151,6 +151,16 @@ SOURCE_FILE
           L_PAREN "("
           R_PAREN ")"
       COMMA ","
+      WHITESPACE "\n    "
+      VARIANT
+        UNDERSCORE "_"
+        WHITESPACE " "
+        EQ "="
+        WHITESPACE " "
+        CONST_ARG
+          RANGE_EXPR
+            DOT2 ".."
+      COMMA ","
       WHITESPACE "\n"
       R_CURLY "}"
   WHITESPACE "\n"

crates/parser/test_data/parser/ok/0019_enums.rs

@@ -22,4 +22,5 @@ enum E5 {
     F {},
     D(u32,),
     E(),
+    _ = ..,
 }

crates/syntax/rust.ungram

@@ -305,7 +305,7 @@ VariantList =
 
 Variant =
   Attr* Visibility?
-  Name FieldList? ('=' ConstArg)?
+  (Name | '_') FieldList? ('=' ConstArg)?
 
 Union =
   Attr* Visibility?

crates/syntax/src/ast/generated/nodes.rs

@@ -2072,6 +2072,8 @@ impl Variant {
     pub fn field_list(&self) -> Option<FieldList> { support::child(&self.syntax) }
     #[inline]
     pub fn eq_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=]) }
+    #[inline]
+    pub fn underscore_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![_]) }
 }
 pub struct VariantList {
     pub(crate) syntax: SyntaxNode,