Merge #5609

5609: Attrs & Vis r=matklad a=matklad

bors r+
🤖

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

1 files changed, 14 insertions, 13 deletions

diff --git a/xtask/src/codegen/rust.ungram b/xtask/src/codegen/rust.ungram
index 4025f7f96..a97cc80e9 100644
--- a/xtask/src/codegen/rust.ungram
+++ b/xtask/src/codegen/rust.ungram
@@ -173,6 +173,20 @@ ConstParam =
 LifetimeParam =
   Attr* 'lifetime'
 
+Visibility =
+  'pub' ('('
+    'super'
+  | 'self'
+  | 'crate'
+  | 'in' Path
+  ')')?
+
+Attr =
+  '#' '!'? '[' Path ('=' input:AttrInput)? ']'
+
+AttrInput =
+  Literal | TokenTree
+
 ParenType =
   '(' TypeRef ')'
 
@@ -391,9 +405,6 @@ TupleStructPat =
 TuplePat =
    '(' args:Pat* ')'
 
-Visibility =
-  'pub' ('(' 'super' | 'self' | 'crate' | 'in' Path ')')?
-
 Name =
   'ident'
 
@@ -416,9 +427,6 @@ MacroStmts =
   statements:Stmt*
   Expr?
 
-Attr =
-  '#' '!'? '[' Path ('=' input:AttrInput)? ']'
-
 TypeBound =
   'lifetime' | 'const'? TypeRef
 
@@ -465,9 +473,6 @@ LifetimeArg =
 ConstArg =
   Literal | BlockExpr BlockExpr
 
-MetaItem =
-  Path '=' AttrInput nested_meta_items:MetaItem*
-
 AdtDef =
   Struct
 | Enum
@@ -488,10 +493,6 @@ TypeRef =
 | ImplTraitType
 | DynTraitType
 
-AttrInput =
-  Literal
-| TokenTree
-
 Stmt =
   LetStmt
 | ExprStmt