7 files changed, 38 insertions, 38 deletions

diff --git a/crates/ra_parser/src/grammar.rs b/crates/ra_parser/src/grammar.rs
index 7dfac2813..22a7acdf3 100644
--- a/crates/ra_parser/src/grammar.rs
+++ b/crates/ra_parser/src/grammar.rs
@@ -142,9 +142,9 @@ pub(crate) fn reparser(
 ) -> Option<fn(&mut Parser)> {
     let res = match node {
         BLOCK_EXPR => expressions::block_expr,
-        RECORD_FIELD_DEF_LIST => items::record_field_def_list,
-        RECORD_FIELD_LIST => items::record_field_list,
-        ENUM_VARIANT_LIST => items::enum_variant_list,
+        RECORD_FIELD_LIST => items::record_field_def_list,
+        RECORD_EXPR_FIELD_LIST => items::record_field_list,
+        VARIANT_LIST => items::enum_variant_list,
         MATCH_ARM_LIST => items::match_arm_list,
         USE_TREE_LIST => items::use_tree_list,
         EXTERN_ITEM_LIST => items::extern_item_list,
diff --git a/crates/ra_parser/src/grammar/expressions.rs b/crates/ra_parser/src/grammar/expressions.rs
index 6e72eea66..e1c25a838 100644
--- a/crates/ra_parser/src/grammar/expressions.rs
+++ b/crates/ra_parser/src/grammar/expressions.rs
@@ -587,7 +587,7 @@ fn path_expr(p: &mut Parser, r: Restrictions) -> (CompletedMarker, BlockLike) {
     match p.current() {
         T!['{'] if !r.forbid_structs => {
             record_field_list(p);
-            (m.complete(p, RECORD_LIT), BlockLike::NotBlock)
+            (m.complete(p, RECORD_EXPR), BlockLike::NotBlock)
         }
         T![!] if !p.at(T![!=]) => {
             let block_like = items::macro_call_after_excl(p);
@@ -627,7 +627,7 @@ pub(crate) fn record_field_list(p: &mut Parser) {
                     p.expect(T![:]);
                 }
                 expr(p);
-                m.complete(p, RECORD_FIELD);
+                m.complete(p, RECORD_EXPR_FIELD);
             }
             T![.] if p.at(T![..]) => {
                 m.abandon(p);
@@ -648,5 +648,5 @@ pub(crate) fn record_field_list(p: &mut Parser) {
         }
     }
     p.expect(T!['}']);
-    m.complete(p, RECORD_FIELD_LIST);
+    m.complete(p, RECORD_EXPR_FIELD_LIST);
 }
diff --git a/crates/ra_parser/src/grammar/items.rs b/crates/ra_parser/src/grammar/items.rs
index 3b73e5346..664b23f6a 100644
--- a/crates/ra_parser/src/grammar/items.rs
+++ b/crates/ra_parser/src/grammar/items.rs
@@ -180,7 +180,7 @@ pub(super) fn maybe_item(p: &mut Parser, m: Marker, flavor: ItemFlavor) -> Resul
         // unsafe const fn bar() {}
         T![fn] => {
             fn_def(p);
-            m.complete(p, FN_DEF);
+            m.complete(p, FN);
         }
 
         // test unsafe_trait
@@ -380,7 +380,7 @@ fn type_def(p: &mut Parser, m: Marker) {
         types::type_(p);
     }
     p.expect(T![;]);
-    m.complete(p, TYPE_ALIAS_DEF);
+    m.complete(p, TYPE_ALIAS);
 }
 
 pub(crate) fn mod_item(p: &mut Parser, m: Marker) {
diff --git a/crates/ra_parser/src/grammar/items/adt.rs b/crates/ra_parser/src/grammar/items/adt.rs
index 74b9f514b..addfb59d4 100644
--- a/crates/ra_parser/src/grammar/items/adt.rs
+++ b/crates/ra_parser/src/grammar/items/adt.rs
@@ -5,13 +5,13 @@ use super::*;
 pub(super) fn struct_def(p: &mut Parser, m: Marker) {
     assert!(p.at(T![struct]));
     p.bump(T![struct]);
-    struct_or_union(p, m, T![struct], STRUCT_DEF);
+    struct_or_union(p, m, T![struct], STRUCT);
 }
 
 pub(super) fn union_def(p: &mut Parser, m: Marker) {
     assert!(p.at_contextual_kw("union"));
     p.bump_remap(T![union]);
-    struct_or_union(p, m, T![union], UNION_DEF);
+    struct_or_union(p, m, T![union], UNION);
 }
 
 fn struct_or_union(p: &mut Parser, m: Marker, kw: SyntaxKind, def: SyntaxKind) {
@@ -64,7 +64,7 @@ pub(super) fn enum_def(p: &mut Parser, m: Marker) {
     } else {
         p.error("expected `{`")
     }
-    m.complete(p, ENUM_DEF);
+    m.complete(p, ENUM);
 }
 
 pub(crate) fn enum_variant_list(p: &mut Parser) {
@@ -91,7 +91,7 @@ pub(crate) fn enum_variant_list(p: &mut Parser) {
             if p.eat(T![=]) {
                 expressions::expr(p);
             }
-            var.complete(p, ENUM_VARIANT);
+            var.complete(p, VARIANT);
         } else {
             var.abandon(p);
             p.err_and_bump("expected enum variant");
@@ -101,7 +101,7 @@ pub(crate) fn enum_variant_list(p: &mut Parser) {
         }
     }
     p.expect(T!['}']);
-    m.complete(p, ENUM_VARIANT_LIST);
+    m.complete(p, VARIANT_LIST);
 }
 
 pub(crate) fn record_field_def_list(p: &mut Parser) {
@@ -119,7 +119,7 @@ pub(crate) fn record_field_def_list(p: &mut Parser) {
         }
     }
     p.expect(T!['}']);
-    m.complete(p, RECORD_FIELD_DEF_LIST);
+    m.complete(p, RECORD_FIELD_LIST);
 
     fn record_field_def(p: &mut Parser) {
         let m = p.start();
@@ -134,7 +134,7 @@ pub(crate) fn record_field_def_list(p: &mut Parser) {
             name(p);
             p.expect(T![:]);
             types::type_(p);
-            m.complete(p, RECORD_FIELD_DEF);
+            m.complete(p, RECORD_FIELD);
         } else {
             m.abandon(p);
             p.err_and_bump("expected field declaration");
@@ -167,12 +167,12 @@ fn tuple_field_def_list(p: &mut Parser) {
             break;
         }
         types::type_(p);
-        m.complete(p, TUPLE_FIELD_DEF);
+        m.complete(p, TUPLE_FIELD);
 
         if !p.at(T![')']) {
             p.expect(T![,]);
         }
     }
     p.expect(T![')']);
-    m.complete(p, TUPLE_FIELD_DEF_LIST);
+    m.complete(p, TUPLE_FIELD_LIST);
 }
diff --git a/crates/ra_parser/src/grammar/items/consts.rs b/crates/ra_parser/src/grammar/items/consts.rs
index 742a7e056..35ad766dc 100644
--- a/crates/ra_parser/src/grammar/items/consts.rs
+++ b/crates/ra_parser/src/grammar/items/consts.rs
@@ -3,11 +3,11 @@
 use super::*;
 
 pub(super) fn static_def(p: &mut Parser, m: Marker) {
-    const_or_static(p, m, T![static], STATIC_DEF)
+    const_or_static(p, m, T![static], STATIC)
 }
 
 pub(super) fn const_def(p: &mut Parser, m: Marker) {
-    const_or_static(p, m, T![const], CONST_DEF)
+    const_or_static(p, m, T![const], CONST)
 }
 
 fn const_or_static(p: &mut Parser, m: Marker, kw: SyntaxKind, def: SyntaxKind) {
diff --git a/crates/ra_parser/src/grammar/type_params.rs b/crates/ra_parser/src/grammar/type_params.rs
index d1330d4b9..90dabb4c0 100644
--- a/crates/ra_parser/src/grammar/type_params.rs
+++ b/crates/ra_parser/src/grammar/type_params.rs
@@ -36,7 +36,7 @@ fn type_param_list(p: &mut Parser) {
         }
     }
     p.expect(T![>]);
-    m.complete(p, TYPE_PARAM_LIST);
+    m.complete(p, GENERIC_PARAM_LIST);
 }
 
 fn lifetime_param(p: &mut Parser, m: Marker) {
diff --git a/crates/ra_parser/src/syntax_kind/generated.rs b/crates/ra_parser/src/syntax_kind/generated.rs
index 4f35e0baa..64889676e 100644
--- a/crates/ra_parser/src/syntax_kind/generated.rs
+++ b/crates/ra_parser/src/syntax_kind/generated.rs
@@ -1,7 +1,7 @@
 //! Generated file, do not edit by hand, see `xtask/src/codegen`
 
 #![allow(bad_style, missing_docs, unreachable_pub)]
-#[doc = r" The kind of syntax node, e.g. `IDENT`, `USE_KW`, or `STRUCT_DEF`."]
+#[doc = r" The kind of syntax node, e.g. `IDENT`, `USE_KW`, or `STRUCT`."]
 #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Debug)]
 #[repr(u16)]
 pub enum SyntaxKind {
@@ -123,19 +123,19 @@ pub enum SyntaxKind {
     L_DOLLAR,
     R_DOLLAR,
     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,
@@ -188,9 +188,9 @@ pub enum SyntaxKind {
     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,
     CALL_EXPR,
@@ -206,12 +206,12 @@ pub enum SyntaxKind {
     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,
@@ -230,7 +230,7 @@ pub enum SyntaxKind {
     NAME_REF,
     LET_STMT,
     EXPR_STMT,
-    TYPE_PARAM_LIST,
+    GENERIC_PARAM_LIST,
     LIFETIME_PARAM,
     TYPE_PARAM,
     CONST_PARAM,