Introduce GenericParam

2 files changed, 20 insertions, 18 deletions

diff --git a/xtask/src/ast_src.rs b/xtask/src/ast_src.rs
index c7087a14e..114898e38 100644
--- a/xtask/src/ast_src.rs
+++ b/xtask/src/ast_src.rs
@@ -204,6 +204,7 @@ pub(crate) const KINDS_SRC: KindsSrc = KindsSrc {
         "LET_STMT",
         "EXPR_STMT",
         "GENERIC_PARAM_LIST",
+        "GENERIC_PARAM",
         "LIFETIME_PARAM",
         "TYPE_PARAM",
         "CONST_PARAM",
diff --git a/xtask/src/codegen/rust.ungram b/xtask/src/codegen/rust.ungram
index cdd3adf45..4025f7f96 100644
--- a/xtask/src/codegen/rust.ungram
+++ b/xtask/src/codegen/rust.ungram
@@ -154,6 +154,25 @@ ExternItemList =
 ExternItem =
   Fn | Static | MacroCall
 
+GenericParamList =
+  '<' (GenericParam (',' GenericParam)* ','?)? '>'
+
+GenericParam =
+  LifetimeParam
+| TypeParam
+| ConstParam
+
+TypeParam =
+  Attr* Name (':' TypeBoundList?)?
+  ('=' default_type:TypeRef)?
+
+ConstParam =
+  Attr* 'const' Name ':' ascribed_type:TypeRef
+  ('=' default_val:Expr)?
+
+LifetimeParam =
+  Attr* 'lifetime'
+
 ParenType =
   '(' TypeRef ')'
 
@@ -400,24 +419,6 @@ MacroStmts =
 Attr =
   '#' '!'? '[' Path ('=' input:AttrInput)? ']'
 
-GenericParamList =
-  '<'
-    TypeParam*
-    LifetimeParam*
-    ConstParam*
-  '>'
-
-TypeParam =
-  Attr* Name (':' TypeBoundList?)?
-  ('=' default_type:TypeRef)?
-
-ConstParam =
-  Attr* 'const' Name ':' ascribed_type:TypeRef
-  ('=' default_val:Expr)?
-
-LifetimeParam =
-  Attr* 'lifetime'
-
 TypeBound =
   'lifetime' | 'const'? TypeRef