From b10e437039c2d7e300f6be6b5de6446419a2d660 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Tue, 28 Jul 2020 20:59:48 +0200
Subject: Fix nameref parsing

---
 crates/ra_parser/src/grammar.rs       | 4 ----
 crates/ra_parser/src/grammar/items.rs | 8 +++++++-
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'crates/ra_parser')

diff --git a/crates/ra_parser/src/grammar.rs b/crates/ra_parser/src/grammar.rs
index caedeead0..de2c98afd 100644
--- a/crates/ra_parser/src/grammar.rs
+++ b/crates/ra_parser/src/grammar.rs
@@ -270,10 +270,6 @@ fn name_ref(p: &mut Parser) {
         let m = p.start();
         p.bump(IDENT);
         m.complete(p, NAME_REF);
-    } else if p.at(T![self]) {
-        let m = p.start();
-        p.bump(T![self]);
-        m.complete(p, T![self]);
     } else {
         p.err_and_bump("expected identifier");
     }
diff --git a/crates/ra_parser/src/grammar/items.rs b/crates/ra_parser/src/grammar/items.rs
index 97642bc24..ffcdaaa99 100644
--- a/crates/ra_parser/src/grammar/items.rs
+++ b/crates/ra_parser/src/grammar/items.rs
@@ -304,7 +304,13 @@ fn extern_crate_item(p: &mut Parser, m: Marker) {
     p.bump(T![extern]);
     assert!(p.at(T![crate]));
     p.bump(T![crate]);
-    name_ref(p);
+
+    if p.at(T![self]) {
+        p.bump(T![self]);
+    } else {
+        name_ref(p);
+    }
+
     opt_alias(p);
     p.expect(T![;]);
     m.complete(p, EXTERN_CRATE_ITEM);
-- 
cgit v1.2.3


From ede5d17b0409f9d5a209aaf16508262dbd2a4489 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Thu, 30 Jul 2020 00:27:00 +0200
Subject: Finish SourceFile grammar

---
 crates/ra_parser/src/syntax_kind/generated.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'crates/ra_parser')

diff --git a/crates/ra_parser/src/syntax_kind/generated.rs b/crates/ra_parser/src/syntax_kind/generated.rs
index e7404492a..625f0c822 100644
--- a/crates/ra_parser/src/syntax_kind/generated.rs
+++ b/crates/ra_parser/src/syntax_kind/generated.rs
@@ -362,4 +362,4 @@ impl SyntaxKind {
     }
 }
 #[macro_export]
-macro_rules ! T { [ ; ] => { $ crate :: SyntaxKind :: SEMICOLON } ; [ , ] => { $ crate :: SyntaxKind :: COMMA } ; [ '(' ] => { $ crate :: SyntaxKind :: L_PAREN } ; [ ')' ] => { $ crate :: SyntaxKind :: R_PAREN } ; [ '{' ] => { $ crate :: SyntaxKind :: L_CURLY } ; [ '}' ] => { $ crate :: SyntaxKind :: R_CURLY } ; [ '[' ] => { $ crate :: SyntaxKind :: L_BRACK } ; [ ']' ] => { $ crate :: SyntaxKind :: R_BRACK } ; [ < ] => { $ crate :: SyntaxKind :: L_ANGLE } ; [ > ] => { $ crate :: SyntaxKind :: R_ANGLE } ; [ @ ] => { $ crate :: SyntaxKind :: AT } ; [ # ] => { $ crate :: SyntaxKind :: POUND } ; [ ~ ] => { $ crate :: SyntaxKind :: TILDE } ; [ ? ] => { $ crate :: SyntaxKind :: QUESTION } ; [ $ ] => { $ crate :: SyntaxKind :: DOLLAR } ; [ & ] => { $ crate :: SyntaxKind :: AMP } ; [ | ] => { $ crate :: SyntaxKind :: PIPE } ; [ + ] => { $ crate :: SyntaxKind :: PLUS } ; [ * ] => { $ crate :: SyntaxKind :: STAR } ; [ / ] => { $ crate :: SyntaxKind :: SLASH } ; [ ^ ] => { $ crate :: SyntaxKind :: CARET } ; [ % ] => { $ crate :: SyntaxKind :: PERCENT } ; [ _ ] => { $ crate :: SyntaxKind :: UNDERSCORE } ; [ . ] => { $ crate :: SyntaxKind :: DOT } ; [ .. ] => { $ crate :: SyntaxKind :: DOT2 } ; [ ... ] => { $ crate :: SyntaxKind :: DOT3 } ; [ ..= ] => { $ crate :: SyntaxKind :: DOT2EQ } ; [ : ] => { $ crate :: SyntaxKind :: COLON } ; [ :: ] => { $ crate :: SyntaxKind :: COLON2 } ; [ = ] => { $ crate :: SyntaxKind :: EQ } ; [ == ] => { $ crate :: SyntaxKind :: EQ2 } ; [ => ] => { $ crate :: SyntaxKind :: FAT_ARROW } ; [ ! ] => { $ crate :: SyntaxKind :: BANG } ; [ != ] => { $ crate :: SyntaxKind :: NEQ } ; [ - ] => { $ crate :: SyntaxKind :: MINUS } ; [ -> ] => { $ crate :: SyntaxKind :: THIN_ARROW } ; [ <= ] => { $ crate :: SyntaxKind :: LTEQ } ; [ >= ] => { $ crate :: SyntaxKind :: GTEQ } ; [ += ] => { $ crate :: SyntaxKind :: PLUSEQ } ; [ -= ] => { $ crate :: SyntaxKind :: MINUSEQ } ; [ |= ] => { $ crate :: SyntaxKind :: PIPEEQ } ; [ &= ] => { $ crate :: SyntaxKind :: AMPEQ } ; [ ^= ] => { $ crate :: SyntaxKind :: CARETEQ } ; [ /= ] => { $ crate :: SyntaxKind :: SLASHEQ } ; [ *= ] => { $ crate :: SyntaxKind :: STAREQ } ; [ %= ] => { $ crate :: SyntaxKind :: PERCENTEQ } ; [ && ] => { $ crate :: SyntaxKind :: AMP2 } ; [ || ] => { $ crate :: SyntaxKind :: PIPE2 } ; [ << ] => { $ crate :: SyntaxKind :: SHL } ; [ >> ] => { $ crate :: SyntaxKind :: SHR } ; [ <<= ] => { $ crate :: SyntaxKind :: SHLEQ } ; [ >>= ] => { $ crate :: SyntaxKind :: SHREQ } ; [ as ] => { $ crate :: SyntaxKind :: AS_KW } ; [ async ] => { $ crate :: SyntaxKind :: ASYNC_KW } ; [ await ] => { $ crate :: SyntaxKind :: AWAIT_KW } ; [ box ] => { $ crate :: SyntaxKind :: BOX_KW } ; [ break ] => { $ crate :: SyntaxKind :: BREAK_KW } ; [ const ] => { $ crate :: SyntaxKind :: CONST_KW } ; [ continue ] => { $ crate :: SyntaxKind :: CONTINUE_KW } ; [ crate ] => { $ crate :: SyntaxKind :: CRATE_KW } ; [ dyn ] => { $ crate :: SyntaxKind :: DYN_KW } ; [ else ] => { $ crate :: SyntaxKind :: ELSE_KW } ; [ enum ] => { $ crate :: SyntaxKind :: ENUM_KW } ; [ extern ] => { $ crate :: SyntaxKind :: EXTERN_KW } ; [ false ] => { $ crate :: SyntaxKind :: FALSE_KW } ; [ fn ] => { $ crate :: SyntaxKind :: FN_KW } ; [ for ] => { $ crate :: SyntaxKind :: FOR_KW } ; [ if ] => { $ crate :: SyntaxKind :: IF_KW } ; [ impl ] => { $ crate :: SyntaxKind :: IMPL_KW } ; [ in ] => { $ crate :: SyntaxKind :: IN_KW } ; [ let ] => { $ crate :: SyntaxKind :: LET_KW } ; [ loop ] => { $ crate :: SyntaxKind :: LOOP_KW } ; [ macro ] => { $ crate :: SyntaxKind :: MACRO_KW } ; [ match ] => { $ crate :: SyntaxKind :: MATCH_KW } ; [ mod ] => { $ crate :: SyntaxKind :: MOD_KW } ; [ move ] => { $ crate :: SyntaxKind :: MOVE_KW } ; [ mut ] => { $ crate :: SyntaxKind :: MUT_KW } ; [ pub ] => { $ crate :: SyntaxKind :: PUB_KW } ; [ ref ] => { $ crate :: SyntaxKind :: REF_KW } ; [ return ] => { $ crate :: SyntaxKind :: RETURN_KW } ; [ self ] => { $ crate :: SyntaxKind :: SELF_KW } ; [ static ] => { $ crate :: SyntaxKind :: STATIC_KW } ; [ struct ] => { $ crate :: SyntaxKind :: STRUCT_KW } ; [ super ] => { $ crate :: SyntaxKind :: SUPER_KW } ; [ trait ] => { $ crate :: SyntaxKind :: TRAIT_KW } ; [ true ] => { $ crate :: SyntaxKind :: TRUE_KW } ; [ try ] => { $ crate :: SyntaxKind :: TRY_KW } ; [ type ] => { $ crate :: SyntaxKind :: TYPE_KW } ; [ unsafe ] => { $ crate :: SyntaxKind :: UNSAFE_KW } ; [ use ] => { $ crate :: SyntaxKind :: USE_KW } ; [ where ] => { $ crate :: SyntaxKind :: WHERE_KW } ; [ while ] => { $ crate :: SyntaxKind :: WHILE_KW } ; [ auto ] => { $ crate :: SyntaxKind :: AUTO_KW } ; [ default ] => { $ crate :: SyntaxKind :: DEFAULT_KW } ; [ existential ] => { $ crate :: SyntaxKind :: EXISTENTIAL_KW } ; [ union ] => { $ crate :: SyntaxKind :: UNION_KW } ; [ raw ] => { $ crate :: SyntaxKind :: RAW_KW } ; [ lifetime ] => { $ crate :: SyntaxKind :: LIFETIME } ; [ ident ] => { $ crate :: SyntaxKind :: IDENT } ; }
+macro_rules ! T { [ ; ] => { $ crate :: SyntaxKind :: SEMICOLON } ; [ , ] => { $ crate :: SyntaxKind :: COMMA } ; [ '(' ] => { $ crate :: SyntaxKind :: L_PAREN } ; [ ')' ] => { $ crate :: SyntaxKind :: R_PAREN } ; [ '{' ] => { $ crate :: SyntaxKind :: L_CURLY } ; [ '}' ] => { $ crate :: SyntaxKind :: R_CURLY } ; [ '[' ] => { $ crate :: SyntaxKind :: L_BRACK } ; [ ']' ] => { $ crate :: SyntaxKind :: R_BRACK } ; [ < ] => { $ crate :: SyntaxKind :: L_ANGLE } ; [ > ] => { $ crate :: SyntaxKind :: R_ANGLE } ; [ @ ] => { $ crate :: SyntaxKind :: AT } ; [ # ] => { $ crate :: SyntaxKind :: POUND } ; [ ~ ] => { $ crate :: SyntaxKind :: TILDE } ; [ ? ] => { $ crate :: SyntaxKind :: QUESTION } ; [ $ ] => { $ crate :: SyntaxKind :: DOLLAR } ; [ & ] => { $ crate :: SyntaxKind :: AMP } ; [ | ] => { $ crate :: SyntaxKind :: PIPE } ; [ + ] => { $ crate :: SyntaxKind :: PLUS } ; [ * ] => { $ crate :: SyntaxKind :: STAR } ; [ / ] => { $ crate :: SyntaxKind :: SLASH } ; [ ^ ] => { $ crate :: SyntaxKind :: CARET } ; [ % ] => { $ crate :: SyntaxKind :: PERCENT } ; [ _ ] => { $ crate :: SyntaxKind :: UNDERSCORE } ; [ . ] => { $ crate :: SyntaxKind :: DOT } ; [ .. ] => { $ crate :: SyntaxKind :: DOT2 } ; [ ... ] => { $ crate :: SyntaxKind :: DOT3 } ; [ ..= ] => { $ crate :: SyntaxKind :: DOT2EQ } ; [ : ] => { $ crate :: SyntaxKind :: COLON } ; [ :: ] => { $ crate :: SyntaxKind :: COLON2 } ; [ = ] => { $ crate :: SyntaxKind :: EQ } ; [ == ] => { $ crate :: SyntaxKind :: EQ2 } ; [ => ] => { $ crate :: SyntaxKind :: FAT_ARROW } ; [ ! ] => { $ crate :: SyntaxKind :: BANG } ; [ != ] => { $ crate :: SyntaxKind :: NEQ } ; [ - ] => { $ crate :: SyntaxKind :: MINUS } ; [ -> ] => { $ crate :: SyntaxKind :: THIN_ARROW } ; [ <= ] => { $ crate :: SyntaxKind :: LTEQ } ; [ >= ] => { $ crate :: SyntaxKind :: GTEQ } ; [ += ] => { $ crate :: SyntaxKind :: PLUSEQ } ; [ -= ] => { $ crate :: SyntaxKind :: MINUSEQ } ; [ |= ] => { $ crate :: SyntaxKind :: PIPEEQ } ; [ &= ] => { $ crate :: SyntaxKind :: AMPEQ } ; [ ^= ] => { $ crate :: SyntaxKind :: CARETEQ } ; [ /= ] => { $ crate :: SyntaxKind :: SLASHEQ } ; [ *= ] => { $ crate :: SyntaxKind :: STAREQ } ; [ %= ] => { $ crate :: SyntaxKind :: PERCENTEQ } ; [ && ] => { $ crate :: SyntaxKind :: AMP2 } ; [ || ] => { $ crate :: SyntaxKind :: PIPE2 } ; [ << ] => { $ crate :: SyntaxKind :: SHL } ; [ >> ] => { $ crate :: SyntaxKind :: SHR } ; [ <<= ] => { $ crate :: SyntaxKind :: SHLEQ } ; [ >>= ] => { $ crate :: SyntaxKind :: SHREQ } ; [ as ] => { $ crate :: SyntaxKind :: AS_KW } ; [ async ] => { $ crate :: SyntaxKind :: ASYNC_KW } ; [ await ] => { $ crate :: SyntaxKind :: AWAIT_KW } ; [ box ] => { $ crate :: SyntaxKind :: BOX_KW } ; [ break ] => { $ crate :: SyntaxKind :: BREAK_KW } ; [ const ] => { $ crate :: SyntaxKind :: CONST_KW } ; [ continue ] => { $ crate :: SyntaxKind :: CONTINUE_KW } ; [ crate ] => { $ crate :: SyntaxKind :: CRATE_KW } ; [ dyn ] => { $ crate :: SyntaxKind :: DYN_KW } ; [ else ] => { $ crate :: SyntaxKind :: ELSE_KW } ; [ enum ] => { $ crate :: SyntaxKind :: ENUM_KW } ; [ extern ] => { $ crate :: SyntaxKind :: EXTERN_KW } ; [ false ] => { $ crate :: SyntaxKind :: FALSE_KW } ; [ fn ] => { $ crate :: SyntaxKind :: FN_KW } ; [ for ] => { $ crate :: SyntaxKind :: FOR_KW } ; [ if ] => { $ crate :: SyntaxKind :: IF_KW } ; [ impl ] => { $ crate :: SyntaxKind :: IMPL_KW } ; [ in ] => { $ crate :: SyntaxKind :: IN_KW } ; [ let ] => { $ crate :: SyntaxKind :: LET_KW } ; [ loop ] => { $ crate :: SyntaxKind :: LOOP_KW } ; [ macro ] => { $ crate :: SyntaxKind :: MACRO_KW } ; [ match ] => { $ crate :: SyntaxKind :: MATCH_KW } ; [ mod ] => { $ crate :: SyntaxKind :: MOD_KW } ; [ move ] => { $ crate :: SyntaxKind :: MOVE_KW } ; [ mut ] => { $ crate :: SyntaxKind :: MUT_KW } ; [ pub ] => { $ crate :: SyntaxKind :: PUB_KW } ; [ ref ] => { $ crate :: SyntaxKind :: REF_KW } ; [ return ] => { $ crate :: SyntaxKind :: RETURN_KW } ; [ self ] => { $ crate :: SyntaxKind :: SELF_KW } ; [ static ] => { $ crate :: SyntaxKind :: STATIC_KW } ; [ struct ] => { $ crate :: SyntaxKind :: STRUCT_KW } ; [ super ] => { $ crate :: SyntaxKind :: SUPER_KW } ; [ trait ] => { $ crate :: SyntaxKind :: TRAIT_KW } ; [ true ] => { $ crate :: SyntaxKind :: TRUE_KW } ; [ try ] => { $ crate :: SyntaxKind :: TRY_KW } ; [ type ] => { $ crate :: SyntaxKind :: TYPE_KW } ; [ unsafe ] => { $ crate :: SyntaxKind :: UNSAFE_KW } ; [ use ] => { $ crate :: SyntaxKind :: USE_KW } ; [ where ] => { $ crate :: SyntaxKind :: WHERE_KW } ; [ while ] => { $ crate :: SyntaxKind :: WHILE_KW } ; [ auto ] => { $ crate :: SyntaxKind :: AUTO_KW } ; [ default ] => { $ crate :: SyntaxKind :: DEFAULT_KW } ; [ existential ] => { $ crate :: SyntaxKind :: EXISTENTIAL_KW } ; [ union ] => { $ crate :: SyntaxKind :: UNION_KW } ; [ raw ] => { $ crate :: SyntaxKind :: RAW_KW } ; [ lifetime ] => { $ crate :: SyntaxKind :: LIFETIME } ; [ ident ] => { $ crate :: SyntaxKind :: IDENT } ; [ shebang ] => { $ crate :: SyntaxKind :: SHEBANG } ; }
-- 
cgit v1.2.3


From 2984da672e0c73d56501c6b6e4d19fd28152b5eb Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Thu, 30 Jul 2020 11:42:51 +0200
Subject: Split ItemList & AssocItemList

---
 crates/ra_parser/src/grammar/items/traits.rs  | 4 ++--
 crates/ra_parser/src/syntax_kind/generated.rs | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'crates/ra_parser')

diff --git a/crates/ra_parser/src/grammar/items/traits.rs b/crates/ra_parser/src/grammar/items/traits.rs
index c819e33be..ef9c8ff5b 100644
--- a/crates/ra_parser/src/grammar/items/traits.rs
+++ b/crates/ra_parser/src/grammar/items/traits.rs
@@ -50,7 +50,7 @@ pub(crate) fn trait_item_list(p: &mut Parser) {
         item_or_macro(p, true, ItemFlavor::Trait);
     }
     p.expect(T!['}']);
-    m.complete(p, ITEM_LIST);
+    m.complete(p, ASSOC_ITEM_LIST);
 }
 
 // test impl_def
@@ -107,7 +107,7 @@ pub(crate) fn impl_item_list(p: &mut Parser) {
         item_or_macro(p, true, ItemFlavor::Mod);
     }
     p.expect(T!['}']);
-    m.complete(p, ITEM_LIST);
+    m.complete(p, ASSOC_ITEM_LIST);
 }
 
 // test impl_type_params
diff --git a/crates/ra_parser/src/syntax_kind/generated.rs b/crates/ra_parser/src/syntax_kind/generated.rs
index 625f0c822..56dadc6af 100644
--- a/crates/ra_parser/src/syntax_kind/generated.rs
+++ b/crates/ra_parser/src/syntax_kind/generated.rs
@@ -213,6 +213,7 @@ pub enum SyntaxKind {
     TUPLE_FIELD_DEF,
     ENUM_VARIANT_LIST,
     ITEM_LIST,
+    ASSOC_ITEM_LIST,
     ATTR,
     META_ITEM,
     USE_TREE,
-- 
cgit v1.2.3


From 081f35fe1b311223866fa5fc7edde2e8048cd901 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Thu, 30 Jul 2020 11:48:19 +0200
Subject: Update tests

---
 crates/ra_parser/src/grammar.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'crates/ra_parser')

diff --git a/crates/ra_parser/src/grammar.rs b/crates/ra_parser/src/grammar.rs
index de2c98afd..3350e23b9 100644
--- a/crates/ra_parser/src/grammar.rs
+++ b/crates/ra_parser/src/grammar.rs
@@ -149,12 +149,12 @@ pub(crate) fn reparser(
         USE_TREE_LIST => items::use_tree_list,
         EXTERN_ITEM_LIST => items::extern_item_list,
         TOKEN_TREE if first_child? == T!['{'] => items::token_tree,
-        ITEM_LIST => match parent? {
+        ASSOC_ITEM_LIST => match parent? {
             IMPL_DEF => items::impl_item_list,
             TRAIT_DEF => items::trait_item_list,
-            MODULE => items::mod_item_list,
             _ => return None,
         },
+        ITEM_LIST => items::mod_item_list,
         _ => return None,
     };
     Some(res)
-- 
cgit v1.2.3


From 6cd2131cafd29ae17442efbcce652bd447576f27 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Thu, 30 Jul 2020 11:58:41 +0200
Subject: Rename Rename

---
 crates/ra_parser/src/grammar.rs               | 2 +-
 crates/ra_parser/src/syntax_kind/generated.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'crates/ra_parser')

diff --git a/crates/ra_parser/src/grammar.rs b/crates/ra_parser/src/grammar.rs
index 3350e23b9..7dfac2813 100644
--- a/crates/ra_parser/src/grammar.rs
+++ b/crates/ra_parser/src/grammar.rs
@@ -224,7 +224,7 @@ fn opt_alias(p: &mut Parser) {
         if !p.eat(T![_]) {
             name(p);
         }
-        m.complete(p, ALIAS);
+        m.complete(p, RENAME);
     }
 }
 
diff --git a/crates/ra_parser/src/syntax_kind/generated.rs b/crates/ra_parser/src/syntax_kind/generated.rs
index 56dadc6af..f14b60b65 100644
--- a/crates/ra_parser/src/syntax_kind/generated.rs
+++ b/crates/ra_parser/src/syntax_kind/generated.rs
@@ -221,7 +221,7 @@ pub enum SyntaxKind {
     PATH,
     PATH_SEGMENT,
     LITERAL,
-    ALIAS,
+    RENAME,
     VISIBILITY,
     WHERE_CLAUSE,
     WHERE_PRED,
-- 
cgit v1.2.3


From d032f872b619c651dc66bfd669ef783108fc122c Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Thu, 30 Jul 2020 12:26:57 +0200
Subject: Finish extern crates grammar

---
 crates/ra_parser/src/grammar/items.rs         | 2 +-
 crates/ra_parser/src/syntax_kind/generated.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'crates/ra_parser')

diff --git a/crates/ra_parser/src/grammar/items.rs b/crates/ra_parser/src/grammar/items.rs
index ffcdaaa99..3b73e5346 100644
--- a/crates/ra_parser/src/grammar/items.rs
+++ b/crates/ra_parser/src/grammar/items.rs
@@ -313,7 +313,7 @@ fn extern_crate_item(p: &mut Parser, m: Marker) {
 
     opt_alias(p);
     p.expect(T![;]);
-    m.complete(p, EXTERN_CRATE_ITEM);
+    m.complete(p, EXTERN_CRATE);
 }
 
 pub(crate) fn extern_item_list(p: &mut Parser) {
diff --git a/crates/ra_parser/src/syntax_kind/generated.rs b/crates/ra_parser/src/syntax_kind/generated.rs
index f14b60b65..116b58858 100644
--- a/crates/ra_parser/src/syntax_kind/generated.rs
+++ b/crates/ra_parser/src/syntax_kind/generated.rs
@@ -128,7 +128,7 @@ pub enum SyntaxKind {
     ENUM_DEF,
     FN_DEF,
     RET_TYPE,
-    EXTERN_CRATE_ITEM,
+    EXTERN_CRATE,
     MODULE,
     USE_ITEM,
     STATIC_DEF,
-- 
cgit v1.2.3


From b1332670c7c471a59f3da113b366e74ac194c38b Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Thu, 30 Jul 2020 14:12:04 +0200
Subject: Rename UseItem -> Use

---
 crates/ra_parser/src/grammar/items/use_item.rs | 2 +-
 crates/ra_parser/src/syntax_kind/generated.rs  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'crates/ra_parser')

diff --git a/crates/ra_parser/src/grammar/items/use_item.rs b/crates/ra_parser/src/grammar/items/use_item.rs
index 3a0c7a31a..8e836a77e 100644
--- a/crates/ra_parser/src/grammar/items/use_item.rs
+++ b/crates/ra_parser/src/grammar/items/use_item.rs
@@ -7,7 +7,7 @@ pub(super) fn use_item(p: &mut Parser, m: Marker) {
     p.bump(T![use]);
     use_tree(p, true);
     p.expect(T![;]);
-    m.complete(p, USE_ITEM);
+    m.complete(p, USE);
 }
 
 /// Parse a use 'tree', such as `some::path` in `use some::path;`
diff --git a/crates/ra_parser/src/syntax_kind/generated.rs b/crates/ra_parser/src/syntax_kind/generated.rs
index 116b58858..4f35e0baa 100644
--- a/crates/ra_parser/src/syntax_kind/generated.rs
+++ b/crates/ra_parser/src/syntax_kind/generated.rs
@@ -130,7 +130,7 @@ pub enum SyntaxKind {
     RET_TYPE,
     EXTERN_CRATE,
     MODULE,
-    USE_ITEM,
+    USE,
     STATIC_DEF,
     CONST_DEF,
     TRAIT_DEF,
-- 
cgit v1.2.3


From 1142112c70b705f59b7d559d9d72cdc831865158 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Thu, 30 Jul 2020 14:51:08 +0200
Subject: Rename FnDef -> Fn

---
 crates/ra_parser/src/grammar/items.rs         | 2 +-
 crates/ra_parser/src/syntax_kind/generated.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'crates/ra_parser')

diff --git a/crates/ra_parser/src/grammar/items.rs b/crates/ra_parser/src/grammar/items.rs
index 3b73e5346..7f8a51ddb 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
diff --git a/crates/ra_parser/src/syntax_kind/generated.rs b/crates/ra_parser/src/syntax_kind/generated.rs
index 4f35e0baa..1390fa407 100644
--- a/crates/ra_parser/src/syntax_kind/generated.rs
+++ b/crates/ra_parser/src/syntax_kind/generated.rs
@@ -126,7 +126,7 @@ pub enum SyntaxKind {
     STRUCT_DEF,
     UNION_DEF,
     ENUM_DEF,
-    FN_DEF,
+    FN,
     RET_TYPE,
     EXTERN_CRATE,
     MODULE,
-- 
cgit v1.2.3


From eb2f8063444b11257111f4f8ade990ec810e0361 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Thu, 30 Jul 2020 15:25:46 +0200
Subject: Rename TypeAliasDef -> TypeAlias

---
 crates/ra_parser/src/grammar/items.rs         | 2 +-
 crates/ra_parser/src/syntax_kind/generated.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'crates/ra_parser')

diff --git a/crates/ra_parser/src/grammar/items.rs b/crates/ra_parser/src/grammar/items.rs
index 7f8a51ddb..664b23f6a 100644
--- a/crates/ra_parser/src/grammar/items.rs
+++ b/crates/ra_parser/src/grammar/items.rs
@@ -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/syntax_kind/generated.rs b/crates/ra_parser/src/syntax_kind/generated.rs
index 1390fa407..b84c3fc79 100644
--- a/crates/ra_parser/src/syntax_kind/generated.rs
+++ b/crates/ra_parser/src/syntax_kind/generated.rs
@@ -135,7 +135,7 @@ pub enum SyntaxKind {
     CONST_DEF,
     TRAIT_DEF,
     IMPL_DEF,
-    TYPE_ALIAS_DEF,
+    TYPE_ALIAS,
     MACRO_CALL,
     TOKEN_TREE,
     MACRO_DEF,
-- 
cgit v1.2.3


From 28ef4c375a9f56d69daf885504aea3df7012bb81 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Thu, 30 Jul 2020 15:36:21 +0200
Subject: Rename TypeParamList -> GenericParamList

---
 crates/ra_parser/src/grammar/type_params.rs   | 2 +-
 crates/ra_parser/src/syntax_kind/generated.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'crates/ra_parser')

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 b84c3fc79..b83690865 100644
--- a/crates/ra_parser/src/syntax_kind/generated.rs
+++ b/crates/ra_parser/src/syntax_kind/generated.rs
@@ -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,
-- 
cgit v1.2.3


From 6f8aa75329d0a4e588e58b8f22f7932bf3d3a706 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Thu, 30 Jul 2020 16:21:30 +0200
Subject: Rename RecordLit -> RecordExpr

---
 crates/ra_parser/src/grammar.rs               | 2 +-
 crates/ra_parser/src/grammar/expressions.rs   | 6 +++---
 crates/ra_parser/src/syntax_kind/generated.rs | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'crates/ra_parser')

diff --git a/crates/ra_parser/src/grammar.rs b/crates/ra_parser/src/grammar.rs
index 7dfac2813..3610e7392 100644
--- a/crates/ra_parser/src/grammar.rs
+++ b/crates/ra_parser/src/grammar.rs
@@ -143,7 +143,7 @@ pub(crate) fn reparser(
     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,
+        RECORD_EXPR_FIELD_LIST => items::record_field_list,
         ENUM_VARIANT_LIST => items::enum_variant_list,
         MATCH_ARM_LIST => items::match_arm_list,
         USE_TREE_LIST => items::use_tree_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/syntax_kind/generated.rs b/crates/ra_parser/src/syntax_kind/generated.rs
index b83690865..ac79786ff 100644
--- a/crates/ra_parser/src/syntax_kind/generated.rs
+++ b/crates/ra_parser/src/syntax_kind/generated.rs
@@ -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,
-- 
cgit v1.2.3


From 0a9e3ccc262fbcbd4cdaab30384f8cb71584544b Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Thu, 30 Jul 2020 16:49:13 +0200
Subject: Rename FieldDef -> Field

---
 crates/ra_parser/src/grammar.rs               | 2 +-
 crates/ra_parser/src/grammar/items/adt.rs     | 8 ++++----
 crates/ra_parser/src/syntax_kind/generated.rs | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'crates/ra_parser')

diff --git a/crates/ra_parser/src/grammar.rs b/crates/ra_parser/src/grammar.rs
index 3610e7392..03041d110 100644
--- a/crates/ra_parser/src/grammar.rs
+++ b/crates/ra_parser/src/grammar.rs
@@ -142,7 +142,7 @@ 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_def_list,
         RECORD_EXPR_FIELD_LIST => items::record_field_list,
         ENUM_VARIANT_LIST => items::enum_variant_list,
         MATCH_ARM_LIST => items::match_arm_list,
diff --git a/crates/ra_parser/src/grammar/items/adt.rs b/crates/ra_parser/src/grammar/items/adt.rs
index 74b9f514b..0e96bf77e 100644
--- a/crates/ra_parser/src/grammar/items/adt.rs
+++ b/crates/ra_parser/src/grammar/items/adt.rs
@@ -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/syntax_kind/generated.rs b/crates/ra_parser/src/syntax_kind/generated.rs
index ac79786ff..8586758b4 100644
--- a/crates/ra_parser/src/syntax_kind/generated.rs
+++ b/crates/ra_parser/src/syntax_kind/generated.rs
@@ -207,10 +207,10 @@ pub enum SyntaxKind {
     EXTERN_BLOCK,
     EXTERN_ITEM_LIST,
     ENUM_VARIANT,
-    RECORD_FIELD_DEF_LIST,
-    RECORD_FIELD_DEF,
-    TUPLE_FIELD_DEF_LIST,
-    TUPLE_FIELD_DEF,
+    RECORD_FIELD_LIST,
+    RECORD_FIELD,
+    TUPLE_FIELD_LIST,
+    TUPLE_FIELD,
     ENUM_VARIANT_LIST,
     ITEM_LIST,
     ASSOC_ITEM_LIST,
-- 
cgit v1.2.3


From 1ae4721c9cfea746fce59a816b1c266bf373d6cf Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Thu, 30 Jul 2020 17:36:46 +0200
Subject: Finalize union grammar

---
 crates/ra_parser/src/grammar/items/adt.rs     | 2 +-
 crates/ra_parser/src/syntax_kind/generated.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'crates/ra_parser')

diff --git a/crates/ra_parser/src/grammar/items/adt.rs b/crates/ra_parser/src/grammar/items/adt.rs
index 0e96bf77e..ec06e2d45 100644
--- a/crates/ra_parser/src/grammar/items/adt.rs
+++ b/crates/ra_parser/src/grammar/items/adt.rs
@@ -11,7 +11,7 @@ pub(super) fn struct_def(p: &mut Parser, m: Marker) {
 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) {
diff --git a/crates/ra_parser/src/syntax_kind/generated.rs b/crates/ra_parser/src/syntax_kind/generated.rs
index 8586758b4..7efdeeac6 100644
--- a/crates/ra_parser/src/syntax_kind/generated.rs
+++ b/crates/ra_parser/src/syntax_kind/generated.rs
@@ -124,7 +124,7 @@ pub enum SyntaxKind {
     R_DOLLAR,
     SOURCE_FILE,
     STRUCT_DEF,
-    UNION_DEF,
+    UNION,
     ENUM_DEF,
     FN,
     RET_TYPE,
-- 
cgit v1.2.3


From 216a5344c8ef3c3e430d2761dc8b1a7b60250a15 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Thu, 30 Jul 2020 17:50:40 +0200
Subject: Rename StructDef -> Struct

---
 crates/ra_parser/src/grammar/items/adt.rs     | 2 +-
 crates/ra_parser/src/syntax_kind/generated.rs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'crates/ra_parser')

diff --git a/crates/ra_parser/src/grammar/items/adt.rs b/crates/ra_parser/src/grammar/items/adt.rs
index ec06e2d45..2f5cfb6b6 100644
--- a/crates/ra_parser/src/grammar/items/adt.rs
+++ b/crates/ra_parser/src/grammar/items/adt.rs
@@ -5,7 +5,7 @@ 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) {
diff --git a/crates/ra_parser/src/syntax_kind/generated.rs b/crates/ra_parser/src/syntax_kind/generated.rs
index 7efdeeac6..4fad765c7 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,7 +123,7 @@ pub enum SyntaxKind {
     L_DOLLAR,
     R_DOLLAR,
     SOURCE_FILE,
-    STRUCT_DEF,
+    STRUCT,
     UNION,
     ENUM_DEF,
     FN,
-- 
cgit v1.2.3


From 609680ef97dbf82c07b6b06e21aa366423892304 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Thu, 30 Jul 2020 17:52:53 +0200
Subject: Rename EnumDef -> Enum

---
 crates/ra_parser/src/grammar/items/adt.rs     | 2 +-
 crates/ra_parser/src/syntax_kind/generated.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'crates/ra_parser')

diff --git a/crates/ra_parser/src/grammar/items/adt.rs b/crates/ra_parser/src/grammar/items/adt.rs
index 2f5cfb6b6..aeb7ce86b 100644
--- a/crates/ra_parser/src/grammar/items/adt.rs
+++ b/crates/ra_parser/src/grammar/items/adt.rs
@@ -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) {
diff --git a/crates/ra_parser/src/syntax_kind/generated.rs b/crates/ra_parser/src/syntax_kind/generated.rs
index 4fad765c7..fde9e55f1 100644
--- a/crates/ra_parser/src/syntax_kind/generated.rs
+++ b/crates/ra_parser/src/syntax_kind/generated.rs
@@ -125,7 +125,7 @@ pub enum SyntaxKind {
     SOURCE_FILE,
     STRUCT,
     UNION,
-    ENUM_DEF,
+    ENUM,
     FN,
     RET_TYPE,
     EXTERN_CRATE,
-- 
cgit v1.2.3


From 1766aae145c6925a33e427f2fe6ef2a56c301665 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Thu, 30 Jul 2020 17:56:53 +0200
Subject: Rename EnumVariant -> Variant

---
 crates/ra_parser/src/grammar.rs               | 2 +-
 crates/ra_parser/src/grammar/items/adt.rs     | 4 ++--
 crates/ra_parser/src/syntax_kind/generated.rs | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'crates/ra_parser')

diff --git a/crates/ra_parser/src/grammar.rs b/crates/ra_parser/src/grammar.rs
index 03041d110..22a7acdf3 100644
--- a/crates/ra_parser/src/grammar.rs
+++ b/crates/ra_parser/src/grammar.rs
@@ -144,7 +144,7 @@ pub(crate) fn reparser(
         BLOCK_EXPR => expressions::block_expr,
         RECORD_FIELD_LIST => items::record_field_def_list,
         RECORD_EXPR_FIELD_LIST => items::record_field_list,
-        ENUM_VARIANT_LIST => items::enum_variant_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/items/adt.rs b/crates/ra_parser/src/grammar/items/adt.rs
index aeb7ce86b..addfb59d4 100644
--- a/crates/ra_parser/src/grammar/items/adt.rs
+++ b/crates/ra_parser/src/grammar/items/adt.rs
@@ -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) {
diff --git a/crates/ra_parser/src/syntax_kind/generated.rs b/crates/ra_parser/src/syntax_kind/generated.rs
index fde9e55f1..3b82347f3 100644
--- a/crates/ra_parser/src/syntax_kind/generated.rs
+++ b/crates/ra_parser/src/syntax_kind/generated.rs
@@ -206,12 +206,12 @@ pub enum SyntaxKind {
     BIN_EXPR,
     EXTERN_BLOCK,
     EXTERN_ITEM_LIST,
-    ENUM_VARIANT,
+    VARIANT,
     RECORD_FIELD_LIST,
     RECORD_FIELD,
     TUPLE_FIELD_LIST,
     TUPLE_FIELD,
-    ENUM_VARIANT_LIST,
+    VARIANT_LIST,
     ITEM_LIST,
     ASSOC_ITEM_LIST,
     ATTR,
-- 
cgit v1.2.3


From 3cd4112bdc924c132cb0eab9d064511a215421ec Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Thu, 30 Jul 2020 18:02:20 +0200
Subject: Finalize const&static grammar

---
 crates/ra_parser/src/grammar/items/consts.rs  | 4 ++--
 crates/ra_parser/src/syntax_kind/generated.rs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'crates/ra_parser')

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/syntax_kind/generated.rs b/crates/ra_parser/src/syntax_kind/generated.rs
index 3b82347f3..64889676e 100644
--- a/crates/ra_parser/src/syntax_kind/generated.rs
+++ b/crates/ra_parser/src/syntax_kind/generated.rs
@@ -131,8 +131,8 @@ pub enum SyntaxKind {
     EXTERN_CRATE,
     MODULE,
     USE,
-    STATIC_DEF,
-    CONST_DEF,
+    STATIC,
+    CONST,
     TRAIT_DEF,
     IMPL_DEF,
     TYPE_ALIAS,
-- 
cgit v1.2.3


From c83467796b6c7365ea4f41900d74444384a9e618 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Thu, 30 Jul 2020 18:17:28 +0200
Subject: Finalize Trait grammar

---
 crates/ra_parser/src/grammar.rs               | 2 +-
 crates/ra_parser/src/grammar/items.rs         | 2 +-
 crates/ra_parser/src/syntax_kind/generated.rs | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'crates/ra_parser')

diff --git a/crates/ra_parser/src/grammar.rs b/crates/ra_parser/src/grammar.rs
index 22a7acdf3..cd4b2381d 100644
--- a/crates/ra_parser/src/grammar.rs
+++ b/crates/ra_parser/src/grammar.rs
@@ -151,7 +151,7 @@ pub(crate) fn reparser(
         TOKEN_TREE if first_child? == T!['{'] => items::token_tree,
         ASSOC_ITEM_LIST => match parent? {
             IMPL_DEF => items::impl_item_list,
-            TRAIT_DEF => items::trait_item_list,
+            TRAIT => items::trait_item_list,
             _ => return None,
         },
         ITEM_LIST => items::mod_item_list,
diff --git a/crates/ra_parser/src/grammar/items.rs b/crates/ra_parser/src/grammar/items.rs
index 664b23f6a..5603d61a9 100644
--- a/crates/ra_parser/src/grammar/items.rs
+++ b/crates/ra_parser/src/grammar/items.rs
@@ -193,7 +193,7 @@ pub(super) fn maybe_item(p: &mut Parser, m: Marker, flavor: ItemFlavor) -> Resul
         // unsafe auto trait T {}
         T![trait] => {
             traits::trait_def(p);
-            m.complete(p, TRAIT_DEF);
+            m.complete(p, TRAIT);
         }
 
         // test unsafe_impl
diff --git a/crates/ra_parser/src/syntax_kind/generated.rs b/crates/ra_parser/src/syntax_kind/generated.rs
index 64889676e..27eed0090 100644
--- a/crates/ra_parser/src/syntax_kind/generated.rs
+++ b/crates/ra_parser/src/syntax_kind/generated.rs
@@ -133,7 +133,7 @@ pub enum SyntaxKind {
     USE,
     STATIC,
     CONST,
-    TRAIT_DEF,
+    TRAIT,
     IMPL_DEF,
     TYPE_ALIAS,
     MACRO_CALL,
-- 
cgit v1.2.3


From c5798c4d75aa807aec47208a49101bdec3affcca Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Thu, 30 Jul 2020 18:28:28 +0200
Subject: Finalize impl Grammar

---
 crates/ra_parser/src/grammar.rs               | 2 +-
 crates/ra_parser/src/grammar/items.rs         | 2 +-
 crates/ra_parser/src/syntax_kind/generated.rs | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'crates/ra_parser')

diff --git a/crates/ra_parser/src/grammar.rs b/crates/ra_parser/src/grammar.rs
index cd4b2381d..c2e1d701e 100644
--- a/crates/ra_parser/src/grammar.rs
+++ b/crates/ra_parser/src/grammar.rs
@@ -150,7 +150,7 @@ pub(crate) fn reparser(
         EXTERN_ITEM_LIST => items::extern_item_list,
         TOKEN_TREE if first_child? == T!['{'] => items::token_tree,
         ASSOC_ITEM_LIST => match parent? {
-            IMPL_DEF => items::impl_item_list,
+            IMPL => items::impl_item_list,
             TRAIT => items::trait_item_list,
             _ => return None,
         },
diff --git a/crates/ra_parser/src/grammar/items.rs b/crates/ra_parser/src/grammar/items.rs
index 5603d61a9..cca524cea 100644
--- a/crates/ra_parser/src/grammar/items.rs
+++ b/crates/ra_parser/src/grammar/items.rs
@@ -221,7 +221,7 @@ pub(super) fn maybe_item(p: &mut Parser, m: Marker, flavor: ItemFlavor) -> Resul
         // unsafe default impl Foo {}
         T![impl] => {
             traits::impl_def(p);
-            m.complete(p, IMPL_DEF);
+            m.complete(p, IMPL);
         }
 
         // test existential_type
diff --git a/crates/ra_parser/src/syntax_kind/generated.rs b/crates/ra_parser/src/syntax_kind/generated.rs
index 27eed0090..d1b22f08a 100644
--- a/crates/ra_parser/src/syntax_kind/generated.rs
+++ b/crates/ra_parser/src/syntax_kind/generated.rs
@@ -134,7 +134,7 @@ pub enum SyntaxKind {
     STATIC,
     CONST,
     TRAIT,
-    IMPL_DEF,
+    IMPL,
     TYPE_ALIAS,
     MACRO_CALL,
     TOKEN_TREE,
-- 
cgit v1.2.3


From 3dce34aaf83c67836c94a526cb90eba8f36e3985 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Thu, 30 Jul 2020 18:52:02 +0200
Subject: Introduce GenericParam

---
 crates/ra_parser/src/syntax_kind/generated.rs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'crates/ra_parser')

diff --git a/crates/ra_parser/src/syntax_kind/generated.rs b/crates/ra_parser/src/syntax_kind/generated.rs
index d1b22f08a..be4da67bc 100644
--- a/crates/ra_parser/src/syntax_kind/generated.rs
+++ b/crates/ra_parser/src/syntax_kind/generated.rs
@@ -231,6 +231,7 @@ pub enum SyntaxKind {
     LET_STMT,
     EXPR_STMT,
     GENERIC_PARAM_LIST,
+    GENERIC_PARAM,
     LIFETIME_PARAM,
     TYPE_PARAM,
     CONST_PARAM,
-- 
cgit v1.2.3


From a6e45c6c69bf258118940941c12d057deb79e60c Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Fri, 31 Jul 2020 13:22:47 +0200
Subject: Reame PlaceholderType -> InferType

---
 crates/ra_parser/src/grammar/types.rs         | 2 +-
 crates/ra_parser/src/syntax_kind/generated.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'crates/ra_parser')

diff --git a/crates/ra_parser/src/grammar/types.rs b/crates/ra_parser/src/grammar/types.rs
index 9e8e3bd97..e9a20fbf1 100644
--- a/crates/ra_parser/src/grammar/types.rs
+++ b/crates/ra_parser/src/grammar/types.rs
@@ -172,7 +172,7 @@ fn placeholder_type(p: &mut Parser) {
     assert!(p.at(T![_]));
     let m = p.start();
     p.bump(T![_]);
-    m.complete(p, PLACEHOLDER_TYPE);
+    m.complete(p, INFER_TYPE);
 }
 
 // test fn_pointer_type
diff --git a/crates/ra_parser/src/syntax_kind/generated.rs b/crates/ra_parser/src/syntax_kind/generated.rs
index be4da67bc..64ab18217 100644
--- a/crates/ra_parser/src/syntax_kind/generated.rs
+++ b/crates/ra_parser/src/syntax_kind/generated.rs
@@ -147,7 +147,7 @@ pub enum SyntaxKind {
     ARRAY_TYPE,
     SLICE_TYPE,
     REFERENCE_TYPE,
-    PLACEHOLDER_TYPE,
+    INFER_TYPE,
     FN_POINTER_TYPE,
     FOR_TYPE,
     IMPL_TRAIT_TYPE,
-- 
cgit v1.2.3


From 633aace41108b74fe6c93c5ab04272067db033f9 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Fri, 31 Jul 2020 17:08:58 +0200
Subject: Rename LambdaExpr -> ClosureExpr

---
 crates/ra_parser/src/grammar/expressions/atom.rs | 2 +-
 crates/ra_parser/src/syntax_kind/generated.rs    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'crates/ra_parser')

diff --git a/crates/ra_parser/src/grammar/expressions/atom.rs b/crates/ra_parser/src/grammar/expressions/atom.rs
index 706a2f796..0b01d3bc6 100644
--- a/crates/ra_parser/src/grammar/expressions/atom.rs
+++ b/crates/ra_parser/src/grammar/expressions/atom.rs
@@ -250,7 +250,7 @@ fn lambda_expr(p: &mut Parser) -> CompletedMarker {
             p.error("expected expression");
         }
     }
-    m.complete(p, LAMBDA_EXPR)
+    m.complete(p, CLOSURE_EXPR)
 }
 
 // test if_expr
diff --git a/crates/ra_parser/src/syntax_kind/generated.rs b/crates/ra_parser/src/syntax_kind/generated.rs
index 64ab18217..2830c0d74 100644
--- a/crates/ra_parser/src/syntax_kind/generated.rs
+++ b/crates/ra_parser/src/syntax_kind/generated.rs
@@ -173,7 +173,7 @@ pub enum SyntaxKind {
     ARRAY_EXPR,
     PAREN_EXPR,
     PATH_EXPR,
-    LAMBDA_EXPR,
+    CLOSURE_EXPR,
     IF_EXPR,
     WHILE_EXPR,
     CONDITION,
-- 
cgit v1.2.3


From 91781c7ce8201b28afd56b4e35eba47e076a8498 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Fri, 31 Jul 2020 18:29:29 +0200
Subject: Rename TypeArgList -> GenericArgList

---
 crates/ra_parser/src/grammar/type_args.rs     | 2 +-
 crates/ra_parser/src/syntax_kind/generated.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'crates/ra_parser')

diff --git a/crates/ra_parser/src/grammar/type_args.rs b/crates/ra_parser/src/grammar/type_args.rs
index 2d61f9d80..8f88d51db 100644
--- a/crates/ra_parser/src/grammar/type_args.rs
+++ b/crates/ra_parser/src/grammar/type_args.rs
@@ -22,7 +22,7 @@ pub(super) fn opt_type_arg_list(p: &mut Parser, colon_colon_required: bool) {
         }
     }
     p.expect(T![>]);
-    m.complete(p, TYPE_ARG_LIST);
+    m.complete(p, GENERIC_ARG_LIST);
 }
 
 // test type_arg
diff --git a/crates/ra_parser/src/syntax_kind/generated.rs b/crates/ra_parser/src/syntax_kind/generated.rs
index 2830c0d74..c3670fb62 100644
--- a/crates/ra_parser/src/syntax_kind/generated.rs
+++ b/crates/ra_parser/src/syntax_kind/generated.rs
@@ -235,7 +235,7 @@ pub enum SyntaxKind {
     LIFETIME_PARAM,
     TYPE_PARAM,
     CONST_PARAM,
-    TYPE_ARG_LIST,
+    GENERIC_ARG_LIST,
     LIFETIME_ARG,
     TYPE_ARG,
     ASSOC_TYPE_ARG,
-- 
cgit v1.2.3


From ddf08daddf7e86d67e8d2e5596f8013b376dd522 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Fri, 31 Jul 2020 18:46:07 +0200
Subject: Fix const arguments grammar

---
 crates/ra_parser/src/grammar/type_args.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'crates/ra_parser')

diff --git a/crates/ra_parser/src/grammar/type_args.rs b/crates/ra_parser/src/grammar/type_args.rs
index 8f88d51db..aef7cd6fb 100644
--- a/crates/ra_parser/src/grammar/type_args.rs
+++ b/crates/ra_parser/src/grammar/type_args.rs
@@ -52,7 +52,7 @@ fn type_arg(p: &mut Parser) {
             m.complete(p, CONST_ARG);
         }
         k if k.is_literal() => {
-            p.bump(k);
+            expressions::literal(p);
             m.complete(p, CONST_ARG);
         }
         _ => {
-- 
cgit v1.2.3


From 14cb96ec0e6be3b99bfe4ea373c058dcbd2a4f79 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Fri, 31 Jul 2020 19:54:16 +0200
Subject: Allign RecordPat with RecordExpr

---
 crates/ra_parser/src/grammar/patterns.rs      | 4 ++--
 crates/ra_parser/src/syntax_kind/generated.rs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'crates/ra_parser')

diff --git a/crates/ra_parser/src/grammar/patterns.rs b/crates/ra_parser/src/grammar/patterns.rs
index 427c0eb49..d5dd9ffa2 100644
--- a/crates/ra_parser/src/grammar/patterns.rs
+++ b/crates/ra_parser/src/grammar/patterns.rs
@@ -217,7 +217,7 @@ fn record_field_pat_list(p: &mut Parser) {
                         bind_pat(p, false);
                     }
                 }
-                m.complete(p, RECORD_FIELD_PAT);
+                m.complete(p, RECORD_PAT_FIELD);
             }
         }
         if !p.at(T!['}']) {
@@ -225,7 +225,7 @@ fn record_field_pat_list(p: &mut Parser) {
         }
     }
     p.expect(T!['}']);
-    m.complete(p, RECORD_FIELD_PAT_LIST);
+    m.complete(p, RECORD_PAT_FIELD_LIST);
 }
 
 // test placeholder_pat
diff --git a/crates/ra_parser/src/syntax_kind/generated.rs b/crates/ra_parser/src/syntax_kind/generated.rs
index c3670fb62..9db328dc3 100644
--- a/crates/ra_parser/src/syntax_kind/generated.rs
+++ b/crates/ra_parser/src/syntax_kind/generated.rs
@@ -161,8 +161,8 @@ pub enum SyntaxKind {
     DOT_DOT_PAT,
     PATH_PAT,
     RECORD_PAT,
-    RECORD_FIELD_PAT_LIST,
-    RECORD_FIELD_PAT,
+    RECORD_PAT_FIELD_LIST,
+    RECORD_PAT_FIELD,
     TUPLE_STRUCT_PAT,
     TUPLE_PAT,
     SLICE_PAT,
-- 
cgit v1.2.3


From 6791eb9685375da94556bb910ea71f78b08be5ec Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Fri, 31 Jul 2020 20:07:21 +0200
Subject: Rename PalceholderPat -> WildcardPat

---
 crates/ra_parser/src/grammar/patterns.rs      | 2 +-
 crates/ra_parser/src/syntax_kind/generated.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'crates/ra_parser')

diff --git a/crates/ra_parser/src/grammar/patterns.rs b/crates/ra_parser/src/grammar/patterns.rs
index d5dd9ffa2..51e413cd6 100644
--- a/crates/ra_parser/src/grammar/patterns.rs
+++ b/crates/ra_parser/src/grammar/patterns.rs
@@ -234,7 +234,7 @@ fn placeholder_pat(p: &mut Parser) -> CompletedMarker {
     assert!(p.at(T![_]));
     let m = p.start();
     p.bump(T![_]);
-    m.complete(p, PLACEHOLDER_PAT)
+    m.complete(p, WILDCARD_PAT)
 }
 
 // test dot_dot_pat
diff --git a/crates/ra_parser/src/syntax_kind/generated.rs b/crates/ra_parser/src/syntax_kind/generated.rs
index 9db328dc3..c24611f4b 100644
--- a/crates/ra_parser/src/syntax_kind/generated.rs
+++ b/crates/ra_parser/src/syntax_kind/generated.rs
@@ -157,7 +157,7 @@ pub enum SyntaxKind {
     REF_PAT,
     BOX_PAT,
     BIND_PAT,
-    PLACEHOLDER_PAT,
+    WILDCARD_PAT,
     DOT_DOT_PAT,
     PATH_PAT,
     RECORD_PAT,
-- 
cgit v1.2.3


From 98181087984157e27faba0b969e384f3c62c39d5 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Fri, 31 Jul 2020 20:09:09 +0200
Subject: Rename BindPat -> IdentPat

---
 crates/ra_parser/src/grammar/patterns.rs      | 2 +-
 crates/ra_parser/src/syntax_kind/generated.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'crates/ra_parser')

diff --git a/crates/ra_parser/src/grammar/patterns.rs b/crates/ra_parser/src/grammar/patterns.rs
index 51e413cd6..623e8d6d4 100644
--- a/crates/ra_parser/src/grammar/patterns.rs
+++ b/crates/ra_parser/src/grammar/patterns.rs
@@ -361,7 +361,7 @@ fn bind_pat(p: &mut Parser, with_at: bool) -> CompletedMarker {
     if with_at && p.eat(T![@]) {
         pattern_single(p);
     }
-    m.complete(p, BIND_PAT)
+    m.complete(p, IDENT_PAT)
 }
 
 // test box_pat
diff --git a/crates/ra_parser/src/syntax_kind/generated.rs b/crates/ra_parser/src/syntax_kind/generated.rs
index c24611f4b..b5dda25a9 100644
--- a/crates/ra_parser/src/syntax_kind/generated.rs
+++ b/crates/ra_parser/src/syntax_kind/generated.rs
@@ -156,7 +156,7 @@ pub enum SyntaxKind {
     PAREN_PAT,
     REF_PAT,
     BOX_PAT,
-    BIND_PAT,
+    IDENT_PAT,
     WILDCARD_PAT,
     DOT_DOT_PAT,
     PATH_PAT,
-- 
cgit v1.2.3


From 22d295ceaaee76dbd555cdeedc0ed7578e66279d Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Fri, 31 Jul 2020 21:45:29 +0200
Subject: Rename DotDotPat -> RestPat

---
 crates/ra_parser/src/grammar/patterns.rs      | 4 ++--
 crates/ra_parser/src/syntax_kind/generated.rs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'crates/ra_parser')

diff --git a/crates/ra_parser/src/grammar/patterns.rs b/crates/ra_parser/src/grammar/patterns.rs
index 623e8d6d4..716bdc978 100644
--- a/crates/ra_parser/src/grammar/patterns.rs
+++ b/crates/ra_parser/src/grammar/patterns.rs
@@ -192,7 +192,7 @@ fn record_field_pat_list(p: &mut Parser) {
     p.bump(T!['{']);
     while !p.at(EOF) && !p.at(T!['}']) {
         match p.current() {
-            // A trailing `..` is *not* treated as a DOT_DOT_PAT.
+            // A trailing `..` is *not* treated as a REST_PAT.
             T![.] if p.at(T![..]) => p.bump(T![..]),
             T!['{'] => error_block(p, "expected ident"),
 
@@ -267,7 +267,7 @@ fn dot_dot_pat(p: &mut Parser) -> CompletedMarker {
     assert!(p.at(T![..]));
     let m = p.start();
     p.bump(T![..]);
-    m.complete(p, DOT_DOT_PAT)
+    m.complete(p, REST_PAT)
 }
 
 // test ref_pat
diff --git a/crates/ra_parser/src/syntax_kind/generated.rs b/crates/ra_parser/src/syntax_kind/generated.rs
index b5dda25a9..b18653aa5 100644
--- a/crates/ra_parser/src/syntax_kind/generated.rs
+++ b/crates/ra_parser/src/syntax_kind/generated.rs
@@ -158,7 +158,7 @@ pub enum SyntaxKind {
     BOX_PAT,
     IDENT_PAT,
     WILDCARD_PAT,
-    DOT_DOT_PAT,
+    REST_PAT,
     PATH_PAT,
     RECORD_PAT,
     RECORD_PAT_FIELD_LIST,
-- 
cgit v1.2.3


From bff8dd094958f1abe2fcfe8fe9f15dc7a7e6b53e Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Sat, 1 Aug 2020 13:47:19 +0200
Subject: Update grammar

---
 crates/ra_parser/src/grammar/types.rs         | 6 +++---
 crates/ra_parser/src/syntax_kind/generated.rs | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'crates/ra_parser')

diff --git a/crates/ra_parser/src/grammar/types.rs b/crates/ra_parser/src/grammar/types.rs
index e9a20fbf1..0aa173a52 100644
--- a/crates/ra_parser/src/grammar/types.rs
+++ b/crates/ra_parser/src/grammar/types.rs
@@ -117,7 +117,7 @@ fn pointer_type(p: &mut Parser) {
     };
 
     type_no_bounds(p);
-    m.complete(p, POINTER_TYPE);
+    m.complete(p, PTR_TYPE);
 }
 
 fn array_or_slice_type(p: &mut Parser) {
@@ -163,7 +163,7 @@ fn reference_type(p: &mut Parser) {
     p.eat(LIFETIME);
     p.eat(T![mut]);
     type_no_bounds(p);
-    m.complete(p, REFERENCE_TYPE);
+    m.complete(p, REF_TYPE);
 }
 
 // test placeholder_type
@@ -201,7 +201,7 @@ fn fn_pointer_type(p: &mut Parser) {
     // test fn_pointer_type_with_ret
     // type F = fn() -> ();
     opt_fn_ret_type(p);
-    m.complete(p, FN_POINTER_TYPE);
+    m.complete(p, FN_PTR_TYPE);
 }
 
 pub(super) fn for_binder(p: &mut Parser) {
diff --git a/crates/ra_parser/src/syntax_kind/generated.rs b/crates/ra_parser/src/syntax_kind/generated.rs
index b18653aa5..192ecd864 100644
--- a/crates/ra_parser/src/syntax_kind/generated.rs
+++ b/crates/ra_parser/src/syntax_kind/generated.rs
@@ -143,12 +143,12 @@ pub enum SyntaxKind {
     TUPLE_TYPE,
     NEVER_TYPE,
     PATH_TYPE,
-    POINTER_TYPE,
+    PTR_TYPE,
     ARRAY_TYPE,
     SLICE_TYPE,
-    REFERENCE_TYPE,
+    REF_TYPE,
     INFER_TYPE,
-    FN_POINTER_TYPE,
+    FN_PTR_TYPE,
     FOR_TYPE,
     IMPL_TRAIT_TYPE,
     DYN_TRAIT_TYPE,
-- 
cgit v1.2.3