Merge #5634

5634: Finish rename r=matklad a=matklad



bors r+
🤖

Co-authored-by: Aleksey Kladov <[email protected]>

1 files changed, 24 insertions, 4 deletions

diff --git a/xtask/src/codegen/rust.ungram b/xtask/src/codegen/rust.ungram
index 02f5aa732..aca23890c 100644
--- a/xtask/src/codegen/rust.ungram
+++ b/xtask/src/codegen/rust.ungram
@@ -1,3 +1,7 @@
+//*************************//
+// Names, Paths and Macros //
+//*************************//
+
 Name =
   'ident'
 
@@ -50,6 +54,10 @@ MacroStmts =
   statements:Stmt*
   Expr?
 
+//*************************//
+//          Items          //
+//*************************//
+
 SourceFile =
   'shebang'?
   Attr*
@@ -245,6 +253,10 @@ Visibility =
 Attr =
   '#' '!'? '[' Path ('=' Literal | TokenTree)? ']'
 
+//****************************//
+// Statements and Expressions //
+//****************************//
+
 Stmt =
   ExprStmt
 | Item
@@ -347,7 +359,7 @@ IndexExpr =
   Attr* base:Expr '[' index:Expr ']'
 
 TupleExpr =
-  Attr* '(' Attr* (Expr (',' Expr)* ','?)? ')'
+  Attr* '(' Attr* fields:(Expr (',' Expr)* ','?)? ')'
 
 RecordExpr =
   Path RecordExprFieldList
@@ -434,6 +446,10 @@ AwaitExpr =
 BoxExpr =
   Attr* 'box' Expr
 
+//*************************//
+//          Types          //
+//*************************//
+
 Type =
   ArrayType
 | DynTraitType
@@ -495,6 +511,10 @@ TypeBound =
   'lifetime'
 | '?'? Type
 
+//************************//
+//        Patterns        //
+//************************//
+
 Pat =
   IdentPat
 | BoxPat
@@ -540,16 +560,16 @@ RecordPatField =
   Attr* (NameRef ':')? Pat
 
 TupleStructPat =
-   Path '(' args:(Pat (',' Pat)* ','?)? ')'
+   Path '(' fields:(Pat (',' Pat)* ','?)? ')'
 
 TuplePat =
-   '(' args:(Pat (',' Pat)* ','?)? ')'
+   '(' fields:(Pat (',' Pat)* ','?)? ')'
 
 ParenPat =
   '(' Pat ')'
 
 SlicePat =
-  '[' args:(Pat (',' Pat)* ','?)? ']'
+  '[' (Pat (',' Pat)* ','?)? ']'
 
 PathPat =
   Path