37 files changed, 150 insertions, 151 deletions

diff --git a/Cargo.lock b/Cargo.lock
index c974022a2..de361cc23 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -279,9 +279,9 @@ checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198"
 
 [[package]]
 name = "drop_bomb"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69b26e475fd29098530e709294e94e661974c851aed42512793f120fed4e199f"
+checksum = "9bda8e21c04aca2ae33ffc2fd8c23134f3cac46db123ba97bd9d3f3b8a4a85e1"
 
 [[package]]
 name = "either"
@@ -1622,9 +1622,9 @@ checksum = "53953d2d3a5ad81d9f844a32f14ebb121f50b650cd59d0ee2a07cf13c617efed"
 
 [[package]]
 name = "tracing"
-version = "0.1.17"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbdf4ccd1652592b01286a5dbe1e2a77d78afaa34beadd9872a5f7396f92aaa9"
+checksum = "f0aae59226cf195d8e74d4b34beae1859257efb4e5fed3f147d2dc2c7d372178"
 dependencies = [
  "cfg-if",
  "tracing-attributes",
@@ -1644,9 +1644,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.11"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94ae75f0d28ae10786f3b1895c55fe72e79928fd5ccdebb5438c75e93fec178f"
+checksum = "b2734b5a028fa697686f16c6d18c2c6a3c7e41513f9a213abb6754c4acb3c8d7"
 dependencies = [
  "lazy_static",
 ]
@@ -1674,9 +1674,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.2.9"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4f5dd7095c2481b7b3cbed71c8de53085fb3542bc3c2b4c73cba43e8f11c7ba"
+checksum = "f7b33f8b2ef2ab0c3778c12646d9c42a24f7772bee4cdafc72199644a9f58fdc"
 dependencies = [
  "ansi_term",
  "chrono",
@@ -1708,9 +1708,9 @@ dependencies = [
 
 [[package]]
 name = "ungrammar"
-version = "0.1.0"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ee12e4891ab3acc2d95d5023022ace22020247bb8a8d1ece875a443f7dab37d"
+checksum = "c4e20e58a08ee1bcf8a4695cf74550cf054d6c489105f594beacb2c684210aad"
 
 [[package]]
 name = "unicode-bidi"
@@ -1833,9 +1833,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "write-json"
-version = "0.1.0"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b3f9a784c809a99e38d2e825907617cb03bd880d5421153bc4548e9317f59d0"
+checksum = "06069a848f95fceae3e5e03c0ddc8cb78452b56654ee0c8e68f938cf790fb9e3"
 
 [[package]]
 name = "ws2_32-sys"
diff --git a/crates/ra_assists/src/handlers/introduce_named_lifetime.rs b/crates/ra_assists/src/handlers/introduce_named_lifetime.rs
index 4537c73a1..fbaf3c06b 100644
--- a/crates/ra_assists/src/handlers/introduce_named_lifetime.rs
+++ b/crates/ra_assists/src/handlers/introduce_named_lifetime.rs
@@ -68,7 +68,7 @@ fn generate_fn_def_assist(
         let fn_params_without_lifetime: Vec<_> = param_list
             .params()
             .filter_map(|param| match param.ty() {
-                Some(ast::Type::ReferenceType(ascribed_type))
+                Some(ast::Type::RefType(ascribed_type))
                     if ascribed_type.lifetime_token() == None =>
                 {
                     Some(ascribed_type.amp_token()?.text_range().end())
diff --git a/crates/ra_hir_def/src/type_ref.rs b/crates/ra_hir_def/src/type_ref.rs
index fe6619d9f..6f7884ffe 100644
--- a/crates/ra_hir_def/src/type_ref.rs
+++ b/crates/ra_hir_def/src/type_ref.rs
@@ -94,7 +94,7 @@ impl TypeRef {
                     .map(TypeRef::Path)
                     .unwrap_or(TypeRef::Error)
             }
-            ast::Type::PointerType(inner) => {
+            ast::Type::PtrType(inner) => {
                 let inner_ty = TypeRef::from_ast_opt(&ctx, inner.ty());
                 let mutability = Mutability::from_mutable(inner.mut_token().is_some());
                 TypeRef::RawPtr(Box::new(inner_ty), mutability)
@@ -105,13 +105,13 @@ impl TypeRef {
             ast::Type::SliceType(inner) => {
                 TypeRef::Slice(Box::new(TypeRef::from_ast_opt(&ctx, inner.ty())))
             }
-            ast::Type::ReferenceType(inner) => {
+            ast::Type::RefType(inner) => {
                 let inner_ty = TypeRef::from_ast_opt(&ctx, inner.ty());
                 let mutability = Mutability::from_mutable(inner.mut_token().is_some());
                 TypeRef::Reference(Box::new(inner_ty), mutability)
             }
             ast::Type::InferType(_inner) => TypeRef::Placeholder,
-            ast::Type::FnPointerType(inner) => {
+            ast::Type::FnPtrType(inner) => {
                 let ret_ty = inner
                     .ret_type()
                     .and_then(|rt| rt.ty())
diff --git a/crates/ra_ide/src/references/rename.rs b/crates/ra_ide/src/references/rename.rs
index 3cd6c815b..c8d80fcf7 100644
--- a/crates/ra_ide/src/references/rename.rs
+++ b/crates/ra_ide/src/references/rename.rs
@@ -157,7 +157,7 @@ fn rename_to_self(
     }
     let first_param = params.params().next()?;
     let mutable = match first_param.ty() {
-        Some(ast::Type::ReferenceType(rt)) => rt.mut_token().is_some(),
+        Some(ast::Type::RefType(rt)) => rt.mut_token().is_some(),
         _ => return None, // not renaming other types
     };
 
diff --git a/crates/ra_ide/src/syntax_highlighting.rs b/crates/ra_ide/src/syntax_highlighting.rs
index 32f34ef10..a32ae0165 100644
--- a/crates/ra_ide/src/syntax_highlighting.rs
+++ b/crates/ra_ide/src/syntax_highlighting.rs
@@ -546,7 +546,7 @@ fn highlight_element(
             T![!] if element.parent().and_then(ast::MacroCall::cast).is_some() => {
                 HighlightTag::Macro.into()
             }
-            T![*] if element.parent().and_then(ast::PointerType::cast).is_some() => {
+            T![*] if element.parent().and_then(ast::PtrType::cast).is_some() => {
                 HighlightTag::Keyword.into()
             }
             T![*] if element.parent().and_then(ast::PrefixExpr::cast).is_some() => {
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,
diff --git a/crates/ra_syntax/src/ast/generated/nodes.rs b/crates/ra_syntax/src/ast/generated/nodes.rs
index 5f51c7536..3d49309d1 100644
--- a/crates/ra_syntax/src/ast/generated/nodes.rs
+++ b/crates/ra_syntax/src/ast/generated/nodes.rs
@@ -1006,10 +1006,10 @@ impl DynTraitType {
     pub fn type_bound_list(&self) -> Option<TypeBoundList> { support::child(&self.syntax) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct FnPointerType {
+pub struct FnPtrType {
     pub(crate) syntax: SyntaxNode,
 }
-impl FnPointerType {
+impl FnPtrType {
     pub fn const_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![const]) }
     pub fn async_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![async]) }
     pub fn unsafe_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![unsafe]) }
@@ -1059,20 +1059,20 @@ impl ParenType {
     pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct PointerType {
+pub struct PtrType {
     pub(crate) syntax: SyntaxNode,
 }
-impl PointerType {
+impl PtrType {
     pub fn star_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![*]) }
     pub fn const_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![const]) }
     pub fn mut_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![mut]) }
     pub fn ty(&self) -> Option<Type> { support::child(&self.syntax) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct ReferenceType {
+pub struct RefType {
     pub(crate) syntax: SyntaxNode,
 }
-impl ReferenceType {
+impl RefType {
     pub fn amp_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![&]) }
     pub fn lifetime_token(&self) -> Option<SyntaxToken> {
         support::token(&self.syntax, T![lifetime])
@@ -1263,15 +1263,15 @@ pub enum GenericArg {
 pub enum Type {
     ArrayType(ArrayType),
     DynTraitType(DynTraitType),
-    FnPointerType(FnPointerType),
+    FnPtrType(FnPtrType),
     ForType(ForType),
     ImplTraitType(ImplTraitType),
     InferType(InferType),
     NeverType(NeverType),
     ParenType(ParenType),
     PathType(PathType),
-    PointerType(PointerType),
-    ReferenceType(ReferenceType),
+    PtrType(PtrType),
+    RefType(RefType),
     SliceType(SliceType),
     TupleType(TupleType),
 }
@@ -1377,8 +1377,8 @@ impl ast::NameOwner for AssocItem {}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub enum ExternItem {
     Fn(Fn),
-    Static(Static),
     MacroCall(MacroCall),
+    Static(Static),
 }
 impl ast::AttrsOwner for ExternItem {}
 impl ast::NameOwner for ExternItem {}
@@ -2434,8 +2434,8 @@ impl AstNode for DynTraitType {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for FnPointerType {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == FN_POINTER_TYPE }
+impl AstNode for FnPtrType {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == FN_PTR_TYPE }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         if Self::can_cast(syntax.kind()) {
             Some(Self { syntax })
@@ -2500,8 +2500,8 @@ impl AstNode for ParenType {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for PointerType {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == POINTER_TYPE }
+impl AstNode for PtrType {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == PTR_TYPE }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         if Self::can_cast(syntax.kind()) {
             Some(Self { syntax })
@@ -2511,8 +2511,8 @@ impl AstNode for PointerType {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for ReferenceType {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == REFERENCE_TYPE }
+impl AstNode for RefType {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == REF_TYPE }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         if Self::can_cast(syntax.kind()) {
             Some(Self { syntax })
@@ -2786,8 +2786,8 @@ impl From<ArrayType> for Type {
 impl From<DynTraitType> for Type {
     fn from(node: DynTraitType) -> Type { Type::DynTraitType(node) }
 }
-impl From<FnPointerType> for Type {
-    fn from(node: FnPointerType) -> Type { Type::FnPointerType(node) }
+impl From<FnPtrType> for Type {
+    fn from(node: FnPtrType) -> Type { Type::FnPtrType(node) }
 }
 impl From<ForType> for Type {
     fn from(node: ForType) -> Type { Type::ForType(node) }
@@ -2807,11 +2807,11 @@ impl From<ParenType> for Type {
 impl From<PathType> for Type {
     fn from(node: PathType) -> Type { Type::PathType(node) }
 }
-impl From<PointerType> for Type {
-    fn from(node: PointerType) -> Type { Type::PointerType(node) }
+impl From<PtrType> for Type {
+    fn from(node: PtrType) -> Type { Type::PtrType(node) }
 }
-impl From<ReferenceType> for Type {
-    fn from(node: ReferenceType) -> Type { Type::ReferenceType(node) }
+impl From<RefType> for Type {
+    fn from(node: RefType) -> Type { Type::RefType(node) }
 }
 impl From<SliceType> for Type {
     fn from(node: SliceType) -> Type { Type::SliceType(node) }
@@ -2822,9 +2822,9 @@ impl From<TupleType> for Type {
 impl AstNode for Type {
     fn can_cast(kind: SyntaxKind) -> bool {
         match kind {
-            ARRAY_TYPE | DYN_TRAIT_TYPE | FN_POINTER_TYPE | FOR_TYPE | IMPL_TRAIT_TYPE
-            | INFER_TYPE | NEVER_TYPE | PAREN_TYPE | PATH_TYPE | POINTER_TYPE | REFERENCE_TYPE
-            | SLICE_TYPE | TUPLE_TYPE => true,
+            ARRAY_TYPE | DYN_TRAIT_TYPE | FN_PTR_TYPE | FOR_TYPE | IMPL_TRAIT_TYPE | INFER_TYPE
+            | NEVER_TYPE | PAREN_TYPE | PATH_TYPE | PTR_TYPE | REF_TYPE | SLICE_TYPE
+            | TUPLE_TYPE => true,
             _ => false,
         }
     }
@@ -2832,15 +2832,15 @@ impl AstNode for Type {
         let res = match syntax.kind() {
             ARRAY_TYPE => Type::ArrayType(ArrayType { syntax }),
             DYN_TRAIT_TYPE => Type::DynTraitType(DynTraitType { syntax }),
-            FN_POINTER_TYPE => Type::FnPointerType(FnPointerType { syntax }),
+            FN_PTR_TYPE => Type::FnPtrType(FnPtrType { syntax }),
             FOR_TYPE => Type::ForType(ForType { syntax }),
             IMPL_TRAIT_TYPE => Type::ImplTraitType(ImplTraitType { syntax }),
             INFER_TYPE => Type::InferType(InferType { syntax }),
             NEVER_TYPE => Type::NeverType(NeverType { syntax }),
             PAREN_TYPE => Type::ParenType(ParenType { syntax }),
             PATH_TYPE => Type::PathType(PathType { syntax }),
-            POINTER_TYPE => Type::PointerType(PointerType { syntax }),
-            REFERENCE_TYPE => Type::ReferenceType(ReferenceType { syntax }),
+            PTR_TYPE => Type::PtrType(PtrType { syntax }),
+            REF_TYPE => Type::RefType(RefType { syntax }),
             SLICE_TYPE => Type::SliceType(SliceType { syntax }),
             TUPLE_TYPE => Type::TupleType(TupleType { syntax }),
             _ => return None,
@@ -2851,15 +2851,15 @@ impl AstNode for Type {
         match self {
             Type::ArrayType(it) => &it.syntax,
             Type::DynTraitType(it) => &it.syntax,
-            Type::FnPointerType(it) => &it.syntax,
+            Type::FnPtrType(it) => &it.syntax,
             Type::ForType(it) => &it.syntax,
             Type::ImplTraitType(it) => &it.syntax,
             Type::InferType(it) => &it.syntax,
             Type::NeverType(it) => &it.syntax,
             Type::ParenType(it) => &it.syntax,
             Type::PathType(it) => &it.syntax,
-            Type::PointerType(it) => &it.syntax,
-            Type::ReferenceType(it) => &it.syntax,
+            Type::PtrType(it) => &it.syntax,
+            Type::RefType(it) => &it.syntax,
             Type::SliceType(it) => &it.syntax,
             Type::TupleType(it) => &it.syntax,
         }
@@ -3332,24 +3332,24 @@ impl AstNode for AssocItem {
 impl From<Fn> for ExternItem {
     fn from(node: Fn) -> ExternItem { ExternItem::Fn(node) }
 }
-impl From<Static> for ExternItem {
-    fn from(node: Static) -> ExternItem { ExternItem::Static(node) }
-}
 impl From<MacroCall> for ExternItem {
     fn from(node: MacroCall) -> ExternItem { ExternItem::MacroCall(node) }
 }
+impl From<Static> for ExternItem {
+    fn from(node: Static) -> ExternItem { ExternItem::Static(node) }
+}
 impl AstNode for ExternItem {
     fn can_cast(kind: SyntaxKind) -> bool {
         match kind {
-            FN | STATIC | MACRO_CALL => true,
+            FN | MACRO_CALL | STATIC => true,
             _ => false,
         }
     }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         let res = match syntax.kind() {
             FN => ExternItem::Fn(Fn { syntax }),
-            STATIC => ExternItem::Static(Static { syntax }),
             MACRO_CALL => ExternItem::MacroCall(MacroCall { syntax }),
+            STATIC => ExternItem::Static(Static { syntax }),
             _ => return None,
         };
         Some(res)
@@ -3357,8 +3357,8 @@ impl AstNode for ExternItem {
     fn syntax(&self) -> &SyntaxNode {
         match self {
             ExternItem::Fn(it) => &it.syntax,
-            ExternItem::Static(it) => &it.syntax,
             ExternItem::MacroCall(it) => &it.syntax,
+            ExternItem::Static(it) => &it.syntax,
         }
     }
 }
@@ -3925,7 +3925,7 @@ impl std::fmt::Display for DynTraitType {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for FnPointerType {
+impl std::fmt::Display for FnPtrType {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
     }
@@ -3955,12 +3955,12 @@ impl std::fmt::Display for ParenType {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for PointerType {
+impl std::fmt::Display for PtrType {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for ReferenceType {
+impl std::fmt::Display for RefType {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
     }
diff --git a/crates/ra_syntax/test_data/parser/err/0012_broken_lambda.rast b/crates/ra_syntax/test_data/parser/err/0012_broken_lambda.rast
index c131b79a7..f31c27633 100644
--- a/crates/ra_syntax/test_data/parser/err/0012_broken_lambda.rast
+++ b/crates/ra_syntax/test_data/parser/err/0012_broken_lambda.rast
@@ -39,7 +39,7 @@ [email protected]
             [email protected] "builder"
         [email protected]
         [email protected]
-        REFERENCE[email protected]
+        [email protected]
           [email protected]
           [email protected]
           [email protected]
@@ -56,7 +56,7 @@ [email protected]
             [email protected] "tokens"
         [email protected]
         [email protected]
-        REFERENCE[email protected]
+        [email protected]
           [email protected]
           [email protected]
             [email protected]
@@ -126,7 +126,7 @@ [email protected]
                   [email protected] "idx"
               [email protected]
               [email protected]
-              REFERENCE[email protected]
+              [email protected]
                 [email protected]
                 [email protected]
                 [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast b/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast
index 082625c13..71aa86494 100644
--- a/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast
+++ b/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast
@@ -15,7 +15,7 @@ [email protected]
           [email protected] "\'a"
         [email protected] ">"
       [email protected] " "
-      REFERENCE[email protected]
+      [email protected]
         [email protected] "&"
         [email protected] "\'a"
         [email protected] " "
@@ -44,7 +44,7 @@ [email protected]
       [email protected] " "
       [email protected]
         [email protected] "("
-        REFERENCE[email protected]
+        [email protected]
           [email protected] "&"
           [email protected] "\'a"
           [email protected] " "
@@ -107,12 +107,12 @@ [email protected]
             [email protected] "\'b"
           [email protected] ">"
         [email protected] " "
-        FN_POINTE[email protected]
+        [email protected]
           [email protected] "fn"
           [email protected]
             [email protected] "("
             [email protected]
-              REFERENCE[email protected]
+              [email protected]
                 [email protected] "&"
                 [email protected] "\'a"
                 [email protected] " "
@@ -124,7 +124,7 @@ [email protected]
             [email protected] ","
             [email protected] " "
             [email protected]
-              REFERENCE[email protected]
+              [email protected]
                 [email protected] "&"
                 [email protected] "\'b"
                 [email protected] " "
@@ -178,12 +178,12 @@ [email protected]
                 [email protected] "\'c"
               [email protected] ">"
             [email protected] " "
-            FN_POINTE[email protected]
+            [email protected]
               [email protected] "fn"
               [email protected]
                 [email protected] "("
                 [email protected]
-                  REFERENCE[email protected]
+                  [email protected]
                     [email protected] "&"
                     [email protected] "\'a"
                     [email protected] " "
@@ -195,7 +195,7 @@ [email protected]
                 [email protected] ","
                 [email protected] " "
                 [email protected]
-                  REFERENCE[email protected]
+                  [email protected]
                     [email protected] "&"
                     [email protected] "\'b"
                     [email protected] " "
@@ -207,7 +207,7 @@ [email protected]
                 [email protected] ","
                 [email protected] " "
                 [email protected]
-                  REFERENCE[email protected]
+                  [email protected]
                     [email protected] "&"
                     [email protected] "\'c"
                     [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0003_pointer_type_no_mutability.rast b/crates/ra_syntax/test_data/parser/inline/err/0003_pointer_type_no_mutability.rast
index 2409eefe7..0d8bf6dd6 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0003_pointer_type_no_mutability.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0003_pointer_type_no_mutability.rast
@@ -7,7 +7,7 @@ [email protected]
     [email protected] " "
     [email protected] "="
     [email protected] " "
-    POINTE[email protected]
+    [email protected]
       [email protected] "*"
       [email protected]
         [email protected] "("
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0003_where_pred_for.rast b/crates/ra_syntax/test_data/parser/inline/ok/0003_where_pred_for.rast
index b0f2b5888..62da7b887 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0003_where_pred_for.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0003_where_pred_for.rast
@@ -42,7 +42,7 @@ [email protected]
                   [email protected]
                     [email protected] "("
                     [email protected]
-                      REFERENCE[email protected]
+                      [email protected]
                         [email protected] "&"
                         [email protected] "\'a"
                         [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rast b/crates/ra_syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rast
index 44d92aedb..b650735ba 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rast
@@ -31,7 +31,7 @@ [email protected]
                       [email protected] ","
                       [email protected] " "
                       [email protected]
-                        REFERENCE[email protected]
+                        [email protected]
                           [email protected] "&"
                           [email protected]
                             [email protected]
@@ -41,7 +41,7 @@ [email protected]
                       [email protected] ","
                       [email protected] " "
                       [email protected]
-                        REFERENCE[email protected]
+                        [email protected]
                           [email protected] "&"
                           [email protected]
                             [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0013_pointer_type_mut.rast b/crates/ra_syntax/test_data/parser/inline/ok/0013_pointer_type_mut.rast
index 845b32e6d..d33215b50 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0013_pointer_type_mut.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0013_pointer_type_mut.rast
@@ -7,7 +7,7 @@ [email protected]
     [email protected] " "
     [email protected] "="
     [email protected] " "
-    POINTE[email protected]
+    [email protected]
       [email protected] "*"
       [email protected] "mut"
       [email protected] " "
@@ -24,7 +24,7 @@ [email protected]
     [email protected] " "
     [email protected] "="
     [email protected] " "
-    POINTE[email protected]
+    [email protected]
       [email protected] "*"
       [email protected] "mut"
       [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast b/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast
index 1b31aa95a..ddbd66588 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast
@@ -22,7 +22,7 @@ [email protected]
             [email protected] "self"
             [email protected] ":"
             [email protected] " "
-            REFERENCE[email protected]
+            [email protected]
               [email protected] "&"
               [email protected]
                 [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0032_fn_pointer_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0032_fn_pointer_type.rast
index 79a5ee339..dda6577ed 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0032_fn_pointer_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0032_fn_pointer_type.rast
@@ -7,7 +7,7 @@ [email protected]
     [email protected] " "
     [email protected] "="
     [email protected] " "
-    FN_POINTE[email protected]
+    [email protected]
       [email protected] "fn"
       [email protected]
         [email protected] "("
@@ -22,7 +22,7 @@ [email protected]
     [email protected] " "
     [email protected] "="
     [email protected] " "
-    FN_POINTE[email protected]
+    [email protected]
       [email protected] "unsafe"
       [email protected] " "
       [email protected] "fn"
@@ -39,7 +39,7 @@ [email protected]
     [email protected] " "
     [email protected] "="
     [email protected] " "
-    FN_POINTE[email protected]
+    [email protected]
       [email protected] "unsafe"
       [email protected] " "
       [email protected]
@@ -61,7 +61,7 @@ [email protected]
     [email protected] " "
     [email protected] "="
     [email protected] " "
-    FN_POINTE[email protected]
+    [email protected]
       [email protected]
         [email protected] "extern"
         [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0033_reference_type;.rast b/crates/ra_syntax/test_data/parser/inline/ok/0033_reference_type;.rast
index c522f76cf..974df9f9a 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0033_reference_type;.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0033_reference_type;.rast
@@ -7,7 +7,7 @@ [email protected]
     [email protected] " "
     [email protected] "="
     [email protected] " "
-    REFERENCE[email protected]
+    [email protected]
       [email protected] "&"
       [email protected]
         [email protected] "("
@@ -22,7 +22,7 @@ [email protected]
     [email protected] " "
     [email protected] "="
     [email protected] " "
-    REFERENCE[email protected]
+    [email protected]
       [email protected] "&"
       [email protected] "\'static"
       [email protected] " "
@@ -39,7 +39,7 @@ [email protected]
     [email protected] " "
     [email protected] "="
     [email protected] " "
-    REFERENCE[email protected]
+    [email protected]
       [email protected] "&"
       [email protected] "mut"
       [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast b/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast
index c100d1c71..6baea6e3c 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast
@@ -21,7 +21,7 @@ [email protected]
                   [email protected]
                     [email protected] "("
                     [email protected]
-                      REFERENCE[email protected]
+                      [email protected]
                         [email protected] "&"
                         [email protected] "mut"
                         [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast
index 5f4807522..f319d5141 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast
@@ -15,7 +15,7 @@ [email protected]
           [email protected] "\'a"
         [email protected] ">"
       [email protected] " "
-      FN_POINTE[email protected]
+      [email protected]
         [email protected] "fn"
         [email protected]
           [email protected] "("
@@ -45,7 +45,7 @@ [email protected]
           [email protected] "\'a"
         [email protected] ">"
       [email protected] " "
-      FN_POINTE[email protected]
+      [email protected]
         [email protected] "unsafe"
         [email protected] " "
         [email protected]
@@ -57,7 +57,7 @@ [email protected]
         [email protected]
           [email protected] "("
           [email protected]
-            REFERENCE[email protected]
+            [email protected]
               [email protected] "&"
               [email protected] "\'a"
               [email protected] " "
@@ -98,7 +98,7 @@ [email protected]
             [email protected]
               [email protected] "<"
               [email protected]
-                REFERENCE[email protected]
+                [email protected]
                   [email protected] "&"
                   [email protected] "\'a"
                   [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0092_fn_pointer_type_with_ret.rast b/crates/ra_syntax/test_data/parser/inline/ok/0092_fn_pointer_type_with_ret.rast
index 95686977f..f80326465 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0092_fn_pointer_type_with_ret.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0092_fn_pointer_type_with_ret.rast
@@ -7,7 +7,7 @@ [email protected]
     [email protected] " "
     [email protected] "="
     [email protected] " "
-    FN_POINTE[email protected]
+    [email protected]
       [email protected] "fn"
       [email protected]
         [email protected] "("
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast b/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast
index 8d029b592..570b95205 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast
@@ -47,7 +47,7 @@ [email protected]
           [email protected] "_"
         [email protected] ":"
         [email protected] " "
-        REFERENCE[email protected]
+        [email protected]
           [email protected] "&"
           [email protected] "\'a"
           [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0123_param_list_vararg.rast b/crates/ra_syntax/test_data/parser/inline/ok/0123_param_list_vararg.rast
index 27c4f141f..7cdec6634 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0123_param_list_vararg.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0123_param_list_vararg.rast
@@ -21,7 +21,7 @@ [email protected]
                 [email protected] "format"
             [email protected] ":"
             [email protected] " "
-            POINTE[email protected]
+            [email protected]
               [email protected] "*"
               [email protected] "const"
               [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0146_as_precedence.rast b/crates/ra_syntax/test_data/parser/inline/ok/0146_as_precedence.rast
index ca739825a..a36cc8dab 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0146_as_precedence.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0146_as_precedence.rast
@@ -27,7 +27,7 @@ [email protected]
           [email protected] " "
           [email protected] "as"
           [email protected] " "
-          POINTE[email protected]
+          [email protected]
             [email protected] "*"
             [email protected] "const"
             [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0150_array_attrs.rast b/crates/ra_syntax/test_data/parser/inline/ok/0150_array_attrs.rast
index 0c35bf2b7..f284aafcd 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0150_array_attrs.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0150_array_attrs.rast
@@ -6,7 +6,7 @@ [email protected]
       [email protected] "A"
     [email protected] ":"
     [email protected] " "
-    REFERENCE[email protected]
+    [email protected]
       [email protected] "&"
       [email protected]
         [email protected] "["
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0154_fn_pointer_param_ident_path.rast b/crates/ra_syntax/test_data/parser/inline/ok/0154_fn_pointer_param_ident_path.rast
index c48fed03e..e6aff7b37 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0154_fn_pointer_param_ident_path.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0154_fn_pointer_param_ident_path.rast
@@ -7,7 +7,7 @@ [email protected]
     [email protected] " "
     [email protected] "="
     [email protected] " "
-    FN_POINTE[email protected]
+    [email protected]
       [email protected] "fn"
       [email protected]
         [email protected] "("
@@ -33,7 +33,7 @@ [email protected]
     [email protected] " "
     [email protected] "="
     [email protected] " "
-    FN_POINTE[email protected]
+    [email protected]
       [email protected] "fn"
       [email protected]
         [email protected] "("
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0157_fn_pointer_unnamed_arg.rast b/crates/ra_syntax/test_data/parser/inline/ok/0157_fn_pointer_unnamed_arg.rast
index 3079e5bf8..6abb4fe5a 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0157_fn_pointer_unnamed_arg.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0157_fn_pointer_unnamed_arg.rast
@@ -7,7 +7,7 @@ [email protected]
     [email protected] " "
     [email protected] "="
     [email protected] " "
-    FN_POINTE[email protected]
+    [email protected]
       [email protected] "fn"
       [email protected]
         [email protected] "("
diff --git a/crates/ra_syntax/test_data/parser/ok/0031_extern.rast b/crates/ra_syntax/test_data/parser/ok/0031_extern.rast
index 79ea098a2..8150d445f 100644
--- a/crates/ra_syntax/test_data/parser/ok/0031_extern.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0031_extern.rast
@@ -99,7 +99,7 @@ [email protected]
                 [email protected] "addr"
             [email protected] ":"
             [email protected] " "
-            POINTE[email protected]
+            [email protected]
               [email protected] "*"
               [email protected] "const"
               [email protected] " "
@@ -164,7 +164,7 @@ [email protected]
                 [email protected] "address"
             [email protected] ":"
             [email protected] " "
-            POINTE[email protected]
+            [email protected]
               [email protected] "*"
               [email protected] "const"
               [email protected] " "
@@ -278,7 +278,7 @@ [email protected]
                 [email protected] "address"
             [email protected] ":"
             [email protected] " "
-            POINTE[email protected]
+            [email protected]
               [email protected] "*"
               [email protected] "mut"
               [email protected] " "
@@ -295,7 +295,7 @@ [email protected]
                 [email protected] "address_len"
             [email protected] ":"
             [email protected] " "
-            POINTE[email protected]
+            [email protected]
               [email protected] "*"
               [email protected] "mut"
               [email protected] " "
@@ -375,7 +375,7 @@ [email protected]
                 [email protected] "optval"
             [email protected] ":"
             [email protected] " "
-            POINTE[email protected]
+            [email protected]
               [email protected] "*"
               [email protected] "mut"
               [email protected] " "
@@ -393,7 +393,7 @@ [email protected]
                 [email protected] "optlen"
             [email protected] ":"
             [email protected] " "
-            POINTE[email protected]
+            [email protected]
               [email protected] "*"
               [email protected] "mut"
               [email protected] " "
@@ -474,7 +474,7 @@ [email protected]
                 [email protected] "value"
             [email protected] ":"
             [email protected] " "
-            POINTE[email protected]
+            [email protected]
               [email protected] "*"
               [email protected] "const"
               [email protected] " "
@@ -540,7 +540,7 @@ [email protected]
                 [email protected] "address"
             [email protected] ":"
             [email protected] " "
-            POINTE[email protected]
+            [email protected]
               [email protected] "*"
               [email protected] "mut"
               [email protected] " "
@@ -557,7 +557,7 @@ [email protected]
                 [email protected] "address_len"
             [email protected] ":"
             [email protected] " "
-            POINTE[email protected]
+            [email protected]
               [email protected] "*"
               [email protected] "mut"
               [email protected] " "
@@ -609,7 +609,7 @@ [email protected]
                 [email protected] "buf"
             [email protected] ":"
             [email protected] " "
-            POINTE[email protected]
+            [email protected]
               [email protected] "*"
               [email protected] "const"
               [email protected] " "
@@ -655,7 +655,7 @@ [email protected]
                 [email protected] "addr"
             [email protected] ":"
             [email protected] " "
-            POINTE[email protected]
+            [email protected]
               [email protected] "*"
               [email protected] "const"
               [email protected] " "
@@ -720,7 +720,7 @@ [email protected]
                 [email protected] "buf"
             [email protected] ":"
             [email protected] " "
-            POINTE[email protected]
+            [email protected]
               [email protected] "*"
               [email protected] "const"
               [email protected] " "
@@ -801,7 +801,7 @@ [email protected]
                 [email protected] "buf"
             [email protected] ":"
             [email protected] " "
-            POINTE[email protected]
+            [email protected]
               [email protected] "*"
               [email protected] "mut"
               [email protected] " "
@@ -847,7 +847,7 @@ [email protected]
                 [email protected] "addr"
             [email protected] ":"
             [email protected] " "
-            POINTE[email protected]
+            [email protected]
               [email protected] "*"
               [email protected] "mut"
               [email protected] " "
@@ -865,7 +865,7 @@ [email protected]
                 [email protected] "addrlen"
             [email protected] ":"
             [email protected] " "
-            POINTE[email protected]
+            [email protected]
               [email protected] "*"
               [email protected] "mut"
               [email protected] " "
@@ -918,7 +918,7 @@ [email protected]
                 [email protected] "buf"
             [email protected] ":"
             [email protected] " "
-            POINTE[email protected]
+            [email protected]
               [email protected] "*"
               [email protected] "mut"
               [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast b/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast
index 5bb9363a8..7c61b5006 100644
--- a/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast
@@ -242,7 +242,7 @@ [email protected]
                 [email protected] "x"
             [email protected] ":"
             [email protected] " "
-            REFERENCE[email protected]
+            [email protected]
               [email protected] "&"
               [email protected]
                 [email protected]
@@ -1579,7 +1579,7 @@ [email protected]
               [email protected] "union"
             [email protected] ":"
             [email protected] " "
-            REFERENCE[email protected]
+            [email protected]
               [email protected] "&"
               [email protected] "\'union"
               [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast b/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast
index 0303b198f..d4f05f279 100644
--- a/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast
@@ -96,7 +96,7 @@ [email protected]
                 [email protected] "format"
             [email protected] ":"
             [email protected] " "
-            POINTE[email protected]
+            [email protected]
               [email protected] "*"
               [email protected] "const"
               [email protected] " "
@@ -163,7 +163,7 @@ [email protected]
                       [email protected] "]"
                     [email protected] " "
                     [email protected]
-                      REFERENCE[email protected]
+                      [email protected]
                         [email protected] "&"
                         [email protected] "mut"
                         [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast b/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast
index f71ceecd7..f25c9ac36 100644
--- a/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast
@@ -102,7 +102,7 @@ [email protected]
                     [email protected]
                       [email protected] "("
                       [email protected]
-                        REFERENCE[email protected]
+                        [email protected]
                           [email protected] "&"
                           [email protected]
                             [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast b/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast
index 42680b283..8eda59976 100644
--- a/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast
@@ -140,9 +140,9 @@ [email protected]
                     [email protected] "a"
             [email protected] ":"
             [email protected] " "
-            REFERENCE[email protected]
+            [email protected]
               [email protected] "&"
-              REFERENCE[email protected]
+              [email protected]
                 [email protected] "&"
                 [email protected]
                   [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0063_variadic_fun.rast b/crates/ra_syntax/test_data/parser/ok/0063_variadic_fun.rast
index a132591f0..4009b3ff8 100644
--- a/crates/ra_syntax/test_data/parser/ok/0063_variadic_fun.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0063_variadic_fun.rast
@@ -20,7 +20,7 @@ [email protected]
               [email protected] "_"
             [email protected] ":"
             [email protected] " "
-            POINTE[email protected]
+            [email protected]
               [email protected] "*"
               [email protected] "mut"
               [email protected] " "
@@ -49,7 +49,7 @@ [email protected]
               [email protected] "_"
             [email protected] ":"
             [email protected] " "
-            POINTE[email protected]
+            [email protected]
               [email protected] "*"
               [email protected] "mut"
               [email protected] " "
@@ -81,7 +81,7 @@ [email protected]
               [email protected] "_"
             [email protected] ":"
             [email protected] " "
-            POINTE[email protected]
+            [email protected]
               [email protected] "*"
               [email protected] "mut"
               [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast b/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast
index 94260db7c..a3c6ed82e 100644
--- a/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast
@@ -143,9 +143,9 @@ [email protected]
                     [email protected] "a"
             [email protected] ":"
             [email protected] " "
-            REFERENCE[email protected]
+            [email protected]
               [email protected] "&"
-              REFERENCE[email protected]
+              [email protected]
                 [email protected] "&"
                 [email protected]
                   [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0067_where_for_pred.rast b/crates/ra_syntax/test_data/parser/ok/0067_where_for_pred.rast
index fae9467fc..8f8639a37 100644
--- a/crates/ra_syntax/test_data/parser/ok/0067_where_for_pred.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0067_where_for_pred.rast
@@ -42,7 +42,7 @@ [email protected]
                   [email protected]
                     [email protected] "("
                     [email protected]
-                      REFERENCE[email protected]
+                      [email protected]
                         [email protected] "&"
                         [email protected] "\'a"
                         [email protected] " "
@@ -85,7 +85,7 @@ [email protected]
             [email protected] "\'a"
           [email protected] ">"
         [email protected] " "
-        REFERENCE[email protected]
+        [email protected]
           [email protected] "&"
           [email protected] "\'a"
           [email protected] " "
@@ -138,7 +138,7 @@ [email protected]
         [email protected] " "
         [email protected]
           [email protected] "("
-          REFERENCE[email protected]
+          [email protected]
             [email protected] "&"
             [email protected] "\'a"
             [email protected] " "
@@ -160,7 +160,7 @@ [email protected]
                   [email protected]
                     [email protected] "("
                     [email protected]
-                      REFERENCE[email protected]
+                      [email protected]
                         [email protected] "&"
                         [email protected] "\'a"
                         [email protected] " "
@@ -205,7 +205,7 @@ [email protected]
         [email protected] " "
         [email protected]
           [email protected] "["
-          REFERENCE[email protected]
+          [email protected]
             [email protected] "&"
             [email protected] "\'a"
             [email protected] " "
@@ -250,7 +250,7 @@ [email protected]
             [email protected] "_t"
         [email protected] ":"
         [email protected] " "
-        REFERENCE[email protected]
+        [email protected]
           [email protected] "&"
           [email protected]
             [email protected]
@@ -275,7 +275,7 @@ [email protected]
             [email protected]
               [email protected]
                 [email protected] "<"
-                REFERENCE[email protected]
+                [email protected]
                   [email protected] "&"
                   [email protected] "\'a"
                   [email protected] " "
@@ -347,12 +347,12 @@ [email protected]
               [email protected] "\'b"
             [email protected] ">"
           [email protected] " "
-          FN_POINTE[email protected]
+          [email protected]
             [email protected] "fn"
             [email protected]
               [email protected] "("
               [email protected]
-                REFERENCE[email protected]
+                [email protected]
                   [email protected] "&"
                   [email protected] "\'a"
                   [email protected] " "
@@ -364,7 +364,7 @@ [email protected]
               [email protected] ","
               [email protected] " "
               [email protected]
-                REFERENCE[email protected]
+                [email protected]
                   [email protected] "&"
                   [email protected] "\'b"
                   [email protected] " "
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
index 72a2ae26b..1a1140b04 100644
--- a/xtask/Cargo.toml
+++ b/xtask/Cargo.toml
@@ -15,6 +15,6 @@ flate2 = "1.0"
 pico-args = "0.3.1"
 proc-macro2 = "1.0.8"
 quote = "1.0.2"
-ungrammar = "0.1.0"
+ungrammar = "1.1.1"
 walkdir = "2.3.1"
 write-json =  "0.1.0"
diff --git a/xtask/src/ast_src.rs b/xtask/src/ast_src.rs
index 1386fc4e7..adc191254 100644
--- a/xtask/src/ast_src.rs
+++ b/xtask/src/ast_src.rs
@@ -113,12 +113,12 @@ pub(crate) const KINDS_SRC: KindsSrc = KindsSrc {
         "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",
diff --git a/xtask/src/codegen/gen_syntax.rs b/xtask/src/codegen/gen_syntax.rs
index 4602ff1d7..cafad8070 100644
--- a/xtask/src/codegen/gen_syntax.rs
+++ b/xtask/src/codegen/gen_syntax.rs
@@ -10,7 +10,7 @@ use std::{
 
 use proc_macro2::{Punct, Spacing};
 use quote::{format_ident, quote};
-use ungrammar::{Grammar, Rule};
+use ungrammar::{rust_grammar, Grammar, Rule};
 
 use crate::{
     ast_src::{AstEnumSrc, AstNodeSrc, AstSrc, Cardinality, Field, KindsSrc, KINDS_SRC},
@@ -19,9 +19,7 @@ use crate::{
 };
 
 pub fn generate_syntax(mode: Mode) -> Result<()> {
-    let grammar = include_str!("rust.ungram")
-        .parse::<Grammar>()
-        .unwrap_or_else(|err| panic!("\n    \x1b[91merror\x1b[0m: {}\n", err));
+    let grammar = rust_grammar();
     let ast = lower(&grammar);
 
     let syntax_kinds_file = project_root().join(codegen::SYNTAX_KINDS);
@@ -538,6 +536,7 @@ fn lower_enum(grammar: &Grammar, rule: &Rule) -> Option<Vec<String>> {
     for alternative in alternatives {
         match alternative {
             Rule::Node(it) => variants.push(grammar[*it].name.clone()),
+            Rule::Token(it) if grammar[*it].name == ";" => (),
             _ => return None,
         }
     }
@@ -591,8 +590,8 @@ fn lower_rule(acc: &mut Vec<Field>, grammar: &Grammar, label: Option<&String>, r
                     | "index"
                     | "base"
                     | "value"
-                    | "target_type"
-                    | "target_trait"
+                    | "trait"
+                    | "self_ty"
             );
             if manually_implemented {
                 return;