2 files changed, 69 insertions, 68 deletions

diff --git a/xtask/src/ast_src.rs b/xtask/src/ast_src.rs
index 762d9265e..2ff029158 100644
--- a/xtask/src/ast_src.rs
+++ b/xtask/src/ast_src.rs
@@ -126,13 +126,13 @@ pub(crate) const KINDS_SRC: KindsSrc = KindsSrc {
         "PAREN_PAT",
         "REF_PAT",
         "BOX_PAT",
-        "BIND_PAT",
-        "PLACEHOLDER_PAT",
+        "IDENT_PAT",
+        "WILDCARD_PAT",
         "DOT_DOT_PAT",
         "PATH_PAT",
         "RECORD_PAT",
-        "RECORD_FIELD_PAT_LIST",
-        "RECORD_FIELD_PAT",
+        "RECORD_PAT_FIELD_LIST",
+        "RECORD_PAT_FIELD",
         "TUPLE_STRUCT_PAT",
         "TUPLE_PAT",
         "SLICE_PAT",
diff --git a/xtask/src/codegen/rust.ungram b/xtask/src/codegen/rust.ungram
index 2e3b45011..7685f4f06 100644
--- a/xtask/src/codegen/rust.ungram
+++ b/xtask/src/codegen/rust.ungram
@@ -1,3 +1,9 @@
+Name =
+  'ident'
+
+NameRef =
+  'ident' | 'int_number'
+
 Path =
   (qualifier:Path '::')? segment:PathSegment
 
@@ -29,6 +35,21 @@ LifetimeArg =
 ConstArg =
   Expr
 
+MacroCall =
+  Attr* Path '!' Name? TokenTree ';'?
+
+TokenTree =
+  '(' ')'
+| '{' '}'
+| '[' ']'
+
+MacroItems =
+  Item*
+
+MacroStmts =
+  statements:Stmt*
+  Expr?
+
 SourceFile =
   'shebang'?
   Attr*
@@ -475,93 +496,73 @@ TypeBound =
   'lifetime'
 | '?'? Type
 
-OrPat =
-  Pat*
-
-ParenPat =
-  '(' Pat ')'
-
-RefPat =
-  '&' 'mut'? Pat
+Pat =
+  IdentPat
+| BoxPat
+| DotDotPat
+| LiteralPat
+| MacroPat
+| OrPat
+| ParenPat
+| PathPat
+| WildcardPat
+| RangePat
+| RecordPat
+| RefPat
+| SlicePat
+| TuplePat
+| TupleStructPat
 
-BoxPat =
-  'box' Path
+LiteralPat =
+  Literal
 
-BindPat =
+IdentPat =
   Attr* 'ref'? 'mut'? Name ('@' Pat)?
 
-PlaceholderPat =
+WildcardPat =
   '_'
 
-DotDotPat =
-  '..'
-
-PathPat =
-  Path
-
-SlicePat =
-  '[' args:Pat* ']'
-
 RangePat =
-  '..' | '..='
-
-LiteralPat =
-  Literal
+  start:Pat op:('..' | '..=') end:Pat
 
-MacroPat =
-  MacroCall
+RefPat =
+  '&' 'mut'? Pat
 
 RecordPat =
-  Path RecordFieldPatList
+  Path RecordPatFieldList
 
-RecordFieldPatList =
+RecordPatFieldList =
   '{'
-    record_field_pats:RecordFieldPat*
-    BindPat*
+    fields:(RecordPatField (',' RecordPatField)* ','?)
     '..'?
   '}'
 
-RecordFieldPat =
-  Attr* NameRef ':' Pat
+RecordPatField =
+  Attr* (NameRef ':')? Pat
 
 TupleStructPat =
-   Path '(' args:Pat* ')'
+   Path '(' args:(Pat (',' Pat)* ','?)? ')'
 
 TuplePat =
-   '(' args:Pat* ')'
+   '(' args:(Pat (',' Pat)* ','?)? ')'
 
-Name =
-  'ident'
+ParenPat =
+  '(' Pat ')'
 
-NameRef =
-  'ident' | 'int_number'
+SlicePat =
+  '[' args:(Pat (',' Pat)* ','?)? ']'
 
-MacroCall =
-  Attr* Path '!' Name? TokenTree ';'?
+PathPat =
+  Path
 
-TokenTree =
-  '(' ')' | '{' '}' | '[' ']'
+OrPat =
+  (Pat ('|' Pat)* '|'?)
 
-MacroItems =
-  Item*
+BoxPat =
+  'box' Pat
 
-MacroStmts =
-  statements:Stmt*
-  Expr?
+DotDotPat =
+  '..'
 
-Pat =
-  OrPat
-| ParenPat
-| RefPat
-| BoxPat
-| BindPat
-| PlaceholderPat
-| DotDotPat
-| PathPat
-| RecordPat
-| TupleStructPat
-| TuplePat
-| SlicePat
-| RangePat
-| LiteralPat
-| MacroPat
+MacroPat =
+  MacroCall