1 files changed, 21 insertions, 22 deletions

diff --git a/xtask/src/ast_src.rs b/xtask/src/ast_src.rs
index 3a58217c4..56e3f4b0a 100644
--- a/xtask/src/ast_src.rs
+++ b/xtask/src/ast_src.rs
@@ -93,19 +93,19 @@ pub(crate) const KINDS_SRC: KindsSrc = KindsSrc {
     ],
     nodes: &[
         "SOURCE_FILE",
-        "STRUCT_DEF",
-        "UNION_DEF",
-        "ENUM_DEF",
-        "FN_DEF",
+        "STRUCT",
+        "UNION",
+        "ENUM",
+        "FN",
         "RET_TYPE",
         "EXTERN_CRATE",
         "MODULE",
         "USE",
-        "STATIC_DEF",
-        "CONST_DEF",
+        "STATIC",
+        "CONST",
         "TRAIT_DEF",
         "IMPL_DEF",
-        "TYPE_ALIAS_DEF",
+        "TYPE_ALIAS",
         "MACRO_CALL",
         "TOKEN_TREE",
         "MACRO_DEF",
@@ -159,9 +159,9 @@ pub(crate) const KINDS_SRC: KindsSrc = KindsSrc {
         "MATCH_ARM_LIST",
         "MATCH_ARM",
         "MATCH_GUARD",
-        "RECORD_LIT",
-        "RECORD_FIELD_LIST",
-        "RECORD_FIELD",
+        "RECORD_EXPR",
+        "RECORD_EXPR_FIELD_LIST",
+        "RECORD_EXPR_FIELD",
         "EFFECT_EXPR",
         "BOX_EXPR",
         // postfix
@@ -179,12 +179,12 @@ pub(crate) const KINDS_SRC: KindsSrc = KindsSrc {
         "BIN_EXPR",
         "EXTERN_BLOCK",
         "EXTERN_ITEM_LIST",
-        "ENUM_VARIANT",
-        "RECORD_FIELD_DEF_LIST",
-        "RECORD_FIELD_DEF",
-        "TUPLE_FIELD_DEF_LIST",
-        "TUPLE_FIELD_DEF",
-        "ENUM_VARIANT_LIST",
+        "VARIANT",
+        "RECORD_FIELD_LIST",
+        "RECORD_FIELD",
+        "TUPLE_FIELD_LIST",
+        "TUPLE_FIELD",
+        "VARIANT_LIST",
         "ITEM_LIST",
         "ASSOC_ITEM_LIST",
         "ATTR",
@@ -203,7 +203,7 @@ pub(crate) const KINDS_SRC: KindsSrc = KindsSrc {
         "NAME_REF",
         "LET_STMT",
         "EXPR_STMT",
-        "TYPE_PARAM_LIST",
+        "GENERIC_PARAM_LIST",
         "LIFETIME_PARAM",
         "TYPE_PARAM",
         "CONST_PARAM",
@@ -242,14 +242,13 @@ pub(crate) struct AstNodeSrc {
 #[derive(Debug, Eq, PartialEq)]
 pub(crate) enum Field {
     Token(String),
-    Node { name: String, src: FieldSrc },
+    Node { name: String, ty: String, cardinality: Cardinality },
 }
 
 #[derive(Debug, Eq, PartialEq)]
-pub(crate) enum FieldSrc {
-    Shorthand,
-    Optional(String),
-    Many(String),
+pub(crate) enum Cardinality {
+    Optional,
+    Many,
 }
 
 #[derive(Debug)]