266 files changed, 1167 insertions, 1168 deletions

diff --git a/crates/ra_syntax/src/ast.rs b/crates/ra_syntax/src/ast.rs
index c65c485cb..fd426ece9 100644
--- a/crates/ra_syntax/src/ast.rs
+++ b/crates/ra_syntax/src/ast.rs
@@ -139,7 +139,7 @@ fn test_doc_comment_of_statics() {
     )
     .ok()
     .unwrap();
-    let st = file.syntax().descendants().find_map(StaticDef::cast).unwrap();
+    let st = file.syntax().descendants().find_map(Static::cast).unwrap();
     assert_eq!("Number of levels", st.doc_comment_text().unwrap());
 }
 
@@ -235,7 +235,7 @@ fn test_comments_preserve_trailing_whitespace() {
     )
     .ok()
     .unwrap();
-    let def = file.syntax().descendants().find_map(StructDef::cast).unwrap();
+    let def = file.syntax().descendants().find_map(Struct::cast).unwrap();
     assert_eq!(
         "Representation of a Realm.   \nIn the specification these are called Realm Records.",
         def.doc_comment_text().unwrap()
@@ -286,7 +286,7 @@ where
     let mut bounds = pred.type_bound_list().unwrap().bounds();
 
     assert!(pred.for_token().is_none());
-    assert!(pred.type_param_list().is_none());
+    assert!(pred.generic_param_list().is_none());
     assert_eq!("T", pred.type_ref().unwrap().syntax().text().to_string());
     assert_bound("Clone", bounds.next());
     assert_bound("Copy", bounds.next());
@@ -325,7 +325,7 @@ where
     let mut bounds = pred.type_bound_list().unwrap().bounds();
 
     assert!(pred.for_token().is_some());
-    assert_eq!("<'a>", pred.type_param_list().unwrap().syntax().text().to_string());
+    assert_eq!("<'a>", pred.generic_param_list().unwrap().syntax().text().to_string());
     assert_eq!("F", pred.type_ref().unwrap().syntax().text().to_string());
     assert_bound("Fn(&'a str)", bounds.next());
 }
diff --git a/crates/ra_syntax/src/ast/edit.rs b/crates/ra_syntax/src/ast/edit.rs
index 6ebe10ff6..8d3e42f25 100644
--- a/crates/ra_syntax/src/ast/edit.rs
+++ b/crates/ra_syntax/src/ast/edit.rs
@@ -29,9 +29,9 @@ impl ast::BinExpr {
     }
 }
 
-impl ast::FnDef {
+impl ast::Fn {
     #[must_use]
-    pub fn with_body(&self, body: ast::BlockExpr) -> ast::FnDef {
+    pub fn with_body(&self, body: ast::BlockExpr) -> ast::Fn {
         let mut to_insert: ArrayVec<[SyntaxElement; 2]> = ArrayVec::new();
         let old_body_or_semi: SyntaxElement = if let Some(old_body) = self.body() {
             old_body.syntax().clone().into()
@@ -116,18 +116,18 @@ impl ast::AssocItemList {
     }
 }
 
-impl ast::RecordFieldList {
+impl ast::RecordExprFieldList {
     #[must_use]
-    pub fn append_field(&self, field: &ast::RecordField) -> ast::RecordFieldList {
+    pub fn append_field(&self, field: &ast::RecordExprField) -> ast::RecordExprFieldList {
         self.insert_field(InsertPosition::Last, field)
     }
 
     #[must_use]
     pub fn insert_field(
         &self,
-        position: InsertPosition<&'_ ast::RecordField>,
-        field: &ast::RecordField,
-    ) -> ast::RecordFieldList {
+        position: InsertPosition<&'_ ast::RecordExprField>,
+        field: &ast::RecordExprField,
+    ) -> ast::RecordExprFieldList {
         let is_multiline = self.syntax().text().contains_char('\n');
         let ws;
         let space = if is_multiline {
@@ -192,9 +192,9 @@ impl ast::RecordFieldList {
     }
 }
 
-impl ast::TypeAliasDef {
+impl ast::TypeAlias {
     #[must_use]
-    pub fn remove_bounds(&self) -> ast::TypeAliasDef {
+    pub fn remove_bounds(&self) -> ast::TypeAlias {
         let colon = match self.colon_token() {
             Some(it) => it,
             None => return self.clone(),
diff --git a/crates/ra_syntax/src/ast/expr_ext.rs b/crates/ra_syntax/src/ast/expr_ext.rs
index 69c85c809..365f94287 100644
--- a/crates/ra_syntax/src/ast/expr_ext.rs
+++ b/crates/ra_syntax/src/ast/expr_ext.rs
@@ -401,7 +401,7 @@ impl ast::BlockExpr {
             Some(it) => it,
             None => return true,
         };
-        !matches!(parent.kind(), FN_DEF | IF_EXPR | WHILE_EXPR | LOOP_EXPR | EFFECT_EXPR)
+        !matches!(parent.kind(), FN | IF_EXPR | WHILE_EXPR | LOOP_EXPR | EFFECT_EXPR)
     }
 }
 
@@ -412,8 +412,8 @@ fn test_literal_with_attr() {
     assert_eq!(lit.token().text(), r#""Hello""#);
 }
 
-impl ast::RecordField {
-    pub fn parent_record_lit(&self) -> ast::RecordLit {
-        self.syntax().ancestors().find_map(ast::RecordLit::cast).unwrap()
+impl ast::RecordExprField {
+    pub fn parent_record_lit(&self) -> ast::RecordExpr {
+        self.syntax().ancestors().find_map(ast::RecordExpr::cast).unwrap()
     }
 }
diff --git a/crates/ra_syntax/src/ast/generated/nodes.rs b/crates/ra_syntax/src/ast/generated/nodes.rs
index be657699f..00a70fce0 100644
--- a/crates/ra_syntax/src/ast/generated/nodes.rs
+++ b/crates/ra_syntax/src/ast/generated/nodes.rs
@@ -28,32 +28,33 @@ impl Attr {
     pub fn r_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![']']) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct ConstDef {
+pub struct Const {
     pub(crate) syntax: SyntaxNode,
 }
-impl ast::AttrsOwner for ConstDef {}
-impl ast::NameOwner for ConstDef {}
-impl ast::VisibilityOwner for ConstDef {}
-impl ast::TypeAscriptionOwner for ConstDef {}
-impl ConstDef {
+impl ast::AttrsOwner for Const {}
+impl ast::NameOwner for Const {}
+impl ast::VisibilityOwner for Const {}
+impl ast::TypeAscriptionOwner for Const {}
+impl Const {
     pub fn default_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![default]) }
     pub fn const_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![const]) }
+    pub fn underscore_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![_]) }
     pub fn colon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![:]) }
     pub fn eq_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=]) }
     pub fn body(&self) -> Option<Expr> { support::child(&self.syntax) }
     pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct EnumDef {
+pub struct Enum {
     pub(crate) syntax: SyntaxNode,
 }
-impl ast::AttrsOwner for EnumDef {}
-impl ast::NameOwner for EnumDef {}
-impl ast::VisibilityOwner for EnumDef {}
-impl ast::TypeParamsOwner for EnumDef {}
-impl EnumDef {
+impl ast::AttrsOwner for Enum {}
+impl ast::NameOwner for Enum {}
+impl ast::VisibilityOwner for Enum {}
+impl ast::GenericParamsOwner for Enum {}
+impl Enum {
     pub fn enum_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![enum]) }
-    pub fn variant_list(&self) -> Option<EnumVariantList> { support::child(&self.syntax) }
+    pub fn variant_list(&self) -> Option<VariantList> { support::child(&self.syntax) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct ExternBlock {
@@ -79,19 +80,19 @@ impl ExternCrate {
     pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct FnDef {
+pub struct Fn {
     pub(crate) syntax: SyntaxNode,
 }
-impl ast::AttrsOwner for FnDef {}
-impl ast::NameOwner for FnDef {}
-impl ast::VisibilityOwner for FnDef {}
-impl ast::TypeParamsOwner for FnDef {}
-impl FnDef {
-    pub fn abi(&self) -> Option<Abi> { support::child(&self.syntax) }
-    pub fn const_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![const]) }
+impl ast::AttrsOwner for Fn {}
+impl ast::NameOwner for Fn {}
+impl ast::VisibilityOwner for Fn {}
+impl ast::GenericParamsOwner for Fn {}
+impl Fn {
     pub fn default_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![default]) }
     pub fn async_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![async]) }
+    pub fn const_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![const]) }
     pub fn unsafe_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![unsafe]) }
+    pub fn abi(&self) -> Option<Abi> { support::child(&self.syntax) }
     pub fn fn_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![fn]) }
     pub fn param_list(&self) -> Option<ParamList> { support::child(&self.syntax) }
     pub fn ret_type(&self) -> Option<RetType> { support::child(&self.syntax) }
@@ -104,7 +105,7 @@ pub struct ImplDef {
 }
 impl ast::AttrsOwner for ImplDef {}
 impl ast::VisibilityOwner for ImplDef {}
-impl ast::TypeParamsOwner for ImplDef {}
+impl ast::GenericParamsOwner for ImplDef {}
 impl ImplDef {
     pub fn const_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![const]) }
     pub fn default_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![default]) }
@@ -139,14 +140,14 @@ impl Module {
     pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct StaticDef {
+pub struct Static {
     pub(crate) syntax: SyntaxNode,
 }
-impl ast::AttrsOwner for StaticDef {}
-impl ast::NameOwner for StaticDef {}
-impl ast::VisibilityOwner for StaticDef {}
-impl ast::TypeAscriptionOwner for StaticDef {}
-impl StaticDef {
+impl ast::AttrsOwner for Static {}
+impl ast::NameOwner for Static {}
+impl ast::VisibilityOwner for Static {}
+impl ast::TypeAscriptionOwner for Static {}
+impl Static {
     pub fn static_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![static]) }
     pub fn mut_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![mut]) }
     pub fn colon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![:]) }
@@ -155,17 +156,17 @@ impl StaticDef {
     pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct StructDef {
+pub struct Struct {
     pub(crate) syntax: SyntaxNode,
 }
-impl ast::AttrsOwner for StructDef {}
-impl ast::NameOwner for StructDef {}
-impl ast::VisibilityOwner for StructDef {}
-impl ast::TypeParamsOwner for StructDef {}
-impl StructDef {
+impl ast::AttrsOwner for Struct {}
+impl ast::NameOwner for Struct {}
+impl ast::VisibilityOwner for Struct {}
+impl ast::GenericParamsOwner for Struct {}
+impl Struct {
     pub fn struct_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![struct]) }
     pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) }
-    pub fn field_def_list(&self) -> Option<FieldDefList> { support::child(&self.syntax) }
+    pub fn field_list(&self) -> Option<FieldList> { support::child(&self.syntax) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct TraitDef {
@@ -174,7 +175,7 @@ pub struct TraitDef {
 impl ast::AttrsOwner for TraitDef {}
 impl ast::NameOwner for TraitDef {}
 impl ast::VisibilityOwner for TraitDef {}
-impl ast::TypeParamsOwner for TraitDef {}
+impl ast::GenericParamsOwner for TraitDef {}
 impl ast::TypeBoundsOwner for TraitDef {}
 impl TraitDef {
     pub fn unsafe_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![unsafe]) }
@@ -183,15 +184,15 @@ impl TraitDef {
     pub fn assoc_item_list(&self) -> Option<AssocItemList> { support::child(&self.syntax) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct TypeAliasDef {
+pub struct TypeAlias {
     pub(crate) syntax: SyntaxNode,
 }
-impl ast::AttrsOwner for TypeAliasDef {}
-impl ast::NameOwner for TypeAliasDef {}
-impl ast::VisibilityOwner for TypeAliasDef {}
-impl ast::TypeParamsOwner for TypeAliasDef {}
-impl ast::TypeBoundsOwner for TypeAliasDef {}
-impl TypeAliasDef {
+impl ast::AttrsOwner for TypeAlias {}
+impl ast::NameOwner for TypeAlias {}
+impl ast::VisibilityOwner for TypeAlias {}
+impl ast::GenericParamsOwner for TypeAlias {}
+impl ast::TypeBoundsOwner for TypeAlias {}
+impl TypeAlias {
     pub fn default_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![default]) }
     pub fn type_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![type]) }
     pub fn eq_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=]) }
@@ -199,18 +200,16 @@ impl TypeAliasDef {
     pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct UnionDef {
+pub struct Union {
     pub(crate) syntax: SyntaxNode,
 }
-impl ast::AttrsOwner for UnionDef {}
-impl ast::NameOwner for UnionDef {}
-impl ast::VisibilityOwner for UnionDef {}
-impl ast::TypeParamsOwner for UnionDef {}
-impl UnionDef {
+impl ast::AttrsOwner for Union {}
+impl ast::NameOwner for Union {}
+impl ast::VisibilityOwner for Union {}
+impl ast::GenericParamsOwner for Union {}
+impl Union {
     pub fn union_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![union]) }
-    pub fn record_field_def_list(&self) -> Option<RecordFieldDefList> {
-        support::child(&self.syntax)
-    }
+    pub fn record_field_list(&self) -> Option<RecordFieldList> { support::child(&self.syntax) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct Use {
@@ -303,12 +302,14 @@ impl UseTreeList {
 pub struct Abi {
     pub(crate) syntax: SyntaxNode,
 }
-impl Abi {}
+impl Abi {
+    pub fn extern_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![extern]) }
+}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct TypeParamList {
+pub struct GenericParamList {
     pub(crate) syntax: SyntaxNode,
 }
-impl TypeParamList {
+impl GenericParamList {
     pub fn l_angle_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![<]) }
     pub fn type_params(&self) -> AstChildren<TypeParam> { support::children(&self.syntax) }
     pub fn lifetime_params(&self) -> AstChildren<LifetimeParam> { support::children(&self.syntax) }
@@ -321,8 +322,9 @@ pub struct ParamList {
 }
 impl ParamList {
     pub fn l_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['(']) }
-    pub fn self_param(&self) -> Option<SelfParam> { support::child(&self.syntax) }
     pub fn params(&self) -> AstChildren<Param> { support::children(&self.syntax) }
+    pub fn self_param(&self) -> Option<SelfParam> { support::child(&self.syntax) }
+    pub fn comma_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![,]) }
     pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
@@ -355,73 +357,98 @@ impl BlockExpr {
     pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct RecordFieldDefList {
+pub struct Param {
+    pub(crate) syntax: SyntaxNode,
+}
+impl ast::AttrsOwner for Param {}
+impl ast::TypeAscriptionOwner for Param {}
+impl Param {
+    pub fn pat(&self) -> Option<Pat> { support::child(&self.syntax) }
+    pub fn colon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![:]) }
+    pub fn dotdotdot_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![...]) }
+}
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct SelfParam {
+    pub(crate) syntax: SyntaxNode,
+}
+impl ast::AttrsOwner for SelfParam {}
+impl ast::TypeAscriptionOwner for SelfParam {}
+impl SelfParam {
+    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])
+    }
+    pub fn mut_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![mut]) }
+    pub fn self_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![self]) }
+    pub fn colon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![:]) }
+}
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct TypeBoundList {
+    pub(crate) syntax: SyntaxNode,
+}
+impl TypeBoundList {
+    pub fn bounds(&self) -> AstChildren<TypeBound> { support::children(&self.syntax) }
+}
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct RecordFieldList {
     pub(crate) syntax: SyntaxNode,
 }
-impl RecordFieldDefList {
+impl RecordFieldList {
     pub fn l_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['{']) }
-    pub fn fields(&self) -> AstChildren<RecordFieldDef> { support::children(&self.syntax) }
+    pub fn fields(&self) -> AstChildren<RecordField> { support::children(&self.syntax) }
     pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct TupleFieldDefList {
+pub struct TupleFieldList {
     pub(crate) syntax: SyntaxNode,
 }
-impl TupleFieldDefList {
+impl TupleFieldList {
     pub fn l_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['(']) }
-    pub fn fields(&self) -> AstChildren<TupleFieldDef> { support::children(&self.syntax) }
+    pub fn fields(&self) -> AstChildren<TupleField> { support::children(&self.syntax) }
     pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct RecordFieldDef {
+pub struct RecordField {
     pub(crate) syntax: SyntaxNode,
 }
-impl ast::AttrsOwner for RecordFieldDef {}
-impl ast::NameOwner for RecordFieldDef {}
-impl ast::VisibilityOwner for RecordFieldDef {}
-impl ast::TypeAscriptionOwner for RecordFieldDef {}
-impl RecordFieldDef {
+impl ast::AttrsOwner for RecordField {}
+impl ast::NameOwner for RecordField {}
+impl ast::VisibilityOwner for RecordField {}
+impl ast::TypeAscriptionOwner for RecordField {}
+impl RecordField {
     pub fn colon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![:]) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct TupleFieldDef {
+pub struct TupleField {
     pub(crate) syntax: SyntaxNode,
 }
-impl ast::AttrsOwner for TupleFieldDef {}
-impl ast::NameOwner for TupleFieldDef {}
-impl ast::VisibilityOwner for TupleFieldDef {}
-impl TupleFieldDef {
+impl ast::AttrsOwner for TupleField {}
+impl ast::VisibilityOwner for TupleField {}
+impl TupleField {
     pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct EnumVariantList {
+pub struct VariantList {
     pub(crate) syntax: SyntaxNode,
 }
-impl EnumVariantList {
+impl VariantList {
     pub fn l_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['{']) }
-    pub fn variants(&self) -> AstChildren<EnumVariant> { support::children(&self.syntax) }
+    pub fn variants(&self) -> AstChildren<Variant> { support::children(&self.syntax) }
     pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct EnumVariant {
+pub struct Variant {
     pub(crate) syntax: SyntaxNode,
 }
-impl ast::AttrsOwner for EnumVariant {}
-impl ast::NameOwner for EnumVariant {}
-impl ast::VisibilityOwner for EnumVariant {}
-impl EnumVariant {
-    pub fn field_def_list(&self) -> Option<FieldDefList> { support::child(&self.syntax) }
+impl ast::AttrsOwner for Variant {}
+impl ast::NameOwner for Variant {}
+impl ast::VisibilityOwner for Variant {}
+impl Variant {
+    pub fn field_list(&self) -> Option<FieldList> { support::child(&self.syntax) }
     pub fn eq_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=]) }
     pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct TypeBoundList {
-    pub(crate) syntax: SyntaxNode,
-}
-impl TypeBoundList {
-    pub fn bounds(&self) -> AstChildren<TypeBound> { support::children(&self.syntax) }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct AssocItemList {
     pub(crate) syntax: SyntaxNode,
 }
@@ -528,7 +555,7 @@ pub struct ForType {
 }
 impl ForType {
     pub fn for_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![for]) }
-    pub fn type_param_list(&self) -> Option<TypeParamList> { support::child(&self.syntax) }
+    pub fn generic_param_list(&self) -> Option<GenericParamList> { support::child(&self.syntax) }
     pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
@@ -880,30 +907,32 @@ impl MatchGuard {
     pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct RecordLit {
+pub struct RecordExpr {
     pub(crate) syntax: SyntaxNode,
 }
-impl RecordLit {
+impl RecordExpr {
     pub fn path(&self) -> Option<Path> { support::child(&self.syntax) }
-    pub fn record_field_list(&self) -> Option<RecordFieldList> { support::child(&self.syntax) }
+    pub fn record_expr_field_list(&self) -> Option<RecordExprFieldList> {
+        support::child(&self.syntax)
+    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct RecordFieldList {
+pub struct RecordExprFieldList {
     pub(crate) syntax: SyntaxNode,
 }
-impl RecordFieldList {
+impl RecordExprFieldList {
     pub fn l_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['{']) }
-    pub fn fields(&self) -> AstChildren<RecordField> { support::children(&self.syntax) }
+    pub fn fields(&self) -> AstChildren<RecordExprField> { support::children(&self.syntax) }
     pub fn dotdot_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![..]) }
     pub fn spread(&self) -> Option<Expr> { support::child(&self.syntax) }
     pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct RecordField {
+pub struct RecordExprField {
     pub(crate) syntax: SyntaxNode,
 }
-impl ast::AttrsOwner for RecordField {}
-impl RecordField {
+impl ast::AttrsOwner for RecordExprField {}
+impl RecordExprField {
     pub fn name_ref(&self) -> Option<NameRef> { support::child(&self.syntax) }
     pub fn colon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![:]) }
     pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
@@ -1143,7 +1172,7 @@ pub struct WherePred {
 impl ast::TypeBoundsOwner for WherePred {}
 impl WherePred {
     pub fn for_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![for]) }
-    pub fn type_param_list(&self) -> Option<TypeParamList> { support::child(&self.syntax) }
+    pub fn generic_param_list(&self) -> Option<GenericParamList> { support::child(&self.syntax) }
     pub fn lifetime_token(&self) -> Option<SyntaxToken> {
         support::token(&self.syntax, T![lifetime])
     }
@@ -1173,32 +1202,6 @@ impl LetStmt {
     pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct SelfParam {
-    pub(crate) syntax: SyntaxNode,
-}
-impl ast::AttrsOwner for SelfParam {}
-impl ast::TypeAscriptionOwner for SelfParam {}
-impl SelfParam {
-    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])
-    }
-    pub fn mut_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![mut]) }
-    pub fn self_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![self]) }
-    pub fn colon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![:]) }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Param {
-    pub(crate) syntax: SyntaxNode,
-}
-impl ast::AttrsOwner for Param {}
-impl ast::TypeAscriptionOwner for Param {}
-impl Param {
-    pub fn pat(&self) -> Option<Pat> { support::child(&self.syntax) }
-    pub fn colon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![:]) }
-    pub fn dotdotdot_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![...]) }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct PathSegment {
     pub(crate) syntax: SyntaxNode,
 }
@@ -1270,19 +1273,19 @@ impl MetaItem {
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub enum Item {
-    ConstDef(ConstDef),
-    EnumDef(EnumDef),
+    Const(Const),
+    Enum(Enum),
     ExternBlock(ExternBlock),
     ExternCrate(ExternCrate),
-    FnDef(FnDef),
+    Fn(Fn),
     ImplDef(ImplDef),
     MacroCall(MacroCall),
     Module(Module),
-    StaticDef(StaticDef),
-    StructDef(StructDef),
+    Static(Static),
+    Struct(Struct),
     TraitDef(TraitDef),
-    TypeAliasDef(TypeAliasDef),
-    UnionDef(UnionDef),
+    TypeAlias(TypeAlias),
+    Union(Union),
     Use(Use),
 }
 impl ast::AttrsOwner for Item {}
@@ -1303,9 +1306,27 @@ pub enum TypeRef {
     DynTraitType(DynTraitType),
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub enum FieldDefList {
-    RecordFieldDefList(RecordFieldDefList),
-    TupleFieldDefList(TupleFieldDefList),
+pub enum Pat {
+    OrPat(OrPat),
+    ParenPat(ParenPat),
+    RefPat(RefPat),
+    BoxPat(BoxPat),
+    BindPat(BindPat),
+    PlaceholderPat(PlaceholderPat),
+    DotDotPat(DotDotPat),
+    PathPat(PathPat),
+    RecordPat(RecordPat),
+    TupleStructPat(TupleStructPat),
+    TuplePat(TuplePat),
+    SlicePat(SlicePat),
+    RangePat(RangePat),
+    LiteralPat(LiteralPat),
+    MacroPat(MacroPat),
+}
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub enum FieldList {
+    RecordFieldList(RecordFieldList),
+    TupleFieldList(TupleFieldList),
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub enum Expr {
@@ -1324,7 +1345,7 @@ pub enum Expr {
     BlockExpr(BlockExpr),
     ReturnExpr(ReturnExpr),
     MatchExpr(MatchExpr),
-    RecordLit(RecordLit),
+    RecordExpr(RecordExpr),
     CallExpr(CallExpr),
     IndexExpr(IndexExpr),
     MethodCallExpr(MethodCallExpr),
@@ -1343,32 +1364,14 @@ pub enum Expr {
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub enum AssocItem {
-    FnDef(FnDef),
-    TypeAliasDef(TypeAliasDef),
-    ConstDef(ConstDef),
+    Fn(Fn),
+    TypeAlias(TypeAlias),
+    Const(Const),
     MacroCall(MacroCall),
 }
 impl ast::AttrsOwner for AssocItem {}
 impl ast::NameOwner for AssocItem {}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub enum Pat {
-    OrPat(OrPat),
-    ParenPat(ParenPat),
-    RefPat(RefPat),
-    BoxPat(BoxPat),
-    BindPat(BindPat),
-    PlaceholderPat(PlaceholderPat),
-    DotDotPat(DotDotPat),
-    PathPat(PathPat),
-    RecordPat(RecordPat),
-    TupleStructPat(TupleStructPat),
-    TuplePat(TuplePat),
-    SlicePat(SlicePat),
-    RangePat(RangePat),
-    LiteralPat(LiteralPat),
-    MacroPat(MacroPat),
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub enum Stmt {
     LetStmt(LetStmt),
     ExprStmt(ExprStmt),
@@ -1381,21 +1384,21 @@ pub enum AttrInput {
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub enum ExternItem {
-    FnDef(FnDef),
-    StaticDef(StaticDef),
+    Fn(Fn),
+    Static(Static),
 }
 impl ast::AttrsOwner for ExternItem {}
 impl ast::NameOwner for ExternItem {}
 impl ast::VisibilityOwner for ExternItem {}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub enum AdtDef {
-    StructDef(StructDef),
-    EnumDef(EnumDef),
-    UnionDef(UnionDef),
+    Struct(Struct),
+    Enum(Enum),
+    Union(Union),
 }
 impl ast::AttrsOwner for AdtDef {}
+impl ast::GenericParamsOwner for AdtDef {}
 impl ast::NameOwner for AdtDef {}
-impl ast::TypeParamsOwner for AdtDef {}
 impl ast::VisibilityOwner for AdtDef {}
 impl AstNode for SourceFile {
     fn can_cast(kind: SyntaxKind) -> bool { kind == SOURCE_FILE }
@@ -1419,8 +1422,8 @@ impl AstNode for Attr {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for ConstDef {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == CONST_DEF }
+impl AstNode for Const {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == CONST }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         if Self::can_cast(syntax.kind()) {
             Some(Self { syntax })
@@ -1430,8 +1433,8 @@ impl AstNode for ConstDef {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for EnumDef {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == ENUM_DEF }
+impl AstNode for Enum {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == ENUM }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         if Self::can_cast(syntax.kind()) {
             Some(Self { syntax })
@@ -1463,8 +1466,8 @@ impl AstNode for ExternCrate {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for FnDef {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == FN_DEF }
+impl AstNode for Fn {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == FN }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         if Self::can_cast(syntax.kind()) {
             Some(Self { syntax })
@@ -1507,8 +1510,8 @@ impl AstNode for Module {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for StaticDef {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == STATIC_DEF }
+impl AstNode for Static {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == STATIC }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         if Self::can_cast(syntax.kind()) {
             Some(Self { syntax })
@@ -1518,8 +1521,8 @@ impl AstNode for StaticDef {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for StructDef {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == STRUCT_DEF }
+impl AstNode for Struct {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == STRUCT }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         if Self::can_cast(syntax.kind()) {
             Some(Self { syntax })
@@ -1540,8 +1543,8 @@ impl AstNode for TraitDef {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for TypeAliasDef {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == TYPE_ALIAS_DEF }
+impl AstNode for TypeAlias {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == TYPE_ALIAS }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         if Self::can_cast(syntax.kind()) {
             Some(Self { syntax })
@@ -1551,8 +1554,8 @@ impl AstNode for TypeAliasDef {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for UnionDef {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == UNION_DEF }
+impl AstNode for Union {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == UNION }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         if Self::can_cast(syntax.kind()) {
             Some(Self { syntax })
@@ -1672,8 +1675,8 @@ impl AstNode for Abi {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for TypeParamList {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == TYPE_PARAM_LIST }
+impl AstNode for GenericParamList {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == GENERIC_PARAM_LIST }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         if Self::can_cast(syntax.kind()) {
             Some(Self { syntax })
@@ -1727,8 +1730,8 @@ impl AstNode for BlockExpr {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for RecordFieldDefList {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == RECORD_FIELD_DEF_LIST }
+impl AstNode for Param {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == PARAM }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         if Self::can_cast(syntax.kind()) {
             Some(Self { syntax })
@@ -1738,8 +1741,8 @@ impl AstNode for RecordFieldDefList {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for TupleFieldDefList {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == TUPLE_FIELD_DEF_LIST }
+impl AstNode for SelfParam {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == SELF_PARAM }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         if Self::can_cast(syntax.kind()) {
             Some(Self { syntax })
@@ -1749,8 +1752,8 @@ impl AstNode for TupleFieldDefList {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for RecordFieldDef {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == RECORD_FIELD_DEF }
+impl AstNode for TypeBoundList {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == TYPE_BOUND_LIST }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         if Self::can_cast(syntax.kind()) {
             Some(Self { syntax })
@@ -1760,8 +1763,8 @@ impl AstNode for RecordFieldDef {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for TupleFieldDef {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == TUPLE_FIELD_DEF }
+impl AstNode for RecordFieldList {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == RECORD_FIELD_LIST }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         if Self::can_cast(syntax.kind()) {
             Some(Self { syntax })
@@ -1771,8 +1774,8 @@ impl AstNode for TupleFieldDef {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for EnumVariantList {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == ENUM_VARIANT_LIST }
+impl AstNode for TupleFieldList {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == TUPLE_FIELD_LIST }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         if Self::can_cast(syntax.kind()) {
             Some(Self { syntax })
@@ -1782,8 +1785,8 @@ impl AstNode for EnumVariantList {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for EnumVariant {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == ENUM_VARIANT }
+impl AstNode for RecordField {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == RECORD_FIELD }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         if Self::can_cast(syntax.kind()) {
             Some(Self { syntax })
@@ -1793,8 +1796,30 @@ impl AstNode for EnumVariant {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for TypeBoundList {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == TYPE_BOUND_LIST }
+impl AstNode for TupleField {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == TUPLE_FIELD }
+    fn cast(syntax: SyntaxNode) -> Option<Self> {
+        if Self::can_cast(syntax.kind()) {
+            Some(Self { syntax })
+        } else {
+            None
+        }
+    }
+    fn syntax(&self) -> &SyntaxNode { &self.syntax }
+}
+impl AstNode for VariantList {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == VARIANT_LIST }
+    fn cast(syntax: SyntaxNode) -> Option<Self> {
+        if Self::can_cast(syntax.kind()) {
+            Some(Self { syntax })
+        } else {
+            None
+        }
+    }
+    fn syntax(&self) -> &SyntaxNode { &self.syntax }
+}
+impl AstNode for Variant {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == VARIANT }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         if Self::can_cast(syntax.kind()) {
             Some(Self { syntax })
@@ -2332,8 +2357,8 @@ impl AstNode for MatchGuard {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for RecordLit {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == RECORD_LIT }
+impl AstNode for RecordExpr {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == RECORD_EXPR }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         if Self::can_cast(syntax.kind()) {
             Some(Self { syntax })
@@ -2343,8 +2368,8 @@ impl AstNode for RecordLit {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for RecordFieldList {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == RECORD_FIELD_LIST }
+impl AstNode for RecordExprFieldList {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == RECORD_EXPR_FIELD_LIST }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         if Self::can_cast(syntax.kind()) {
             Some(Self { syntax })
@@ -2354,8 +2379,8 @@ impl AstNode for RecordFieldList {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for RecordField {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == RECORD_FIELD }
+impl AstNode for RecordExprField {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == RECORD_EXPR_FIELD }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         if Self::can_cast(syntax.kind()) {
             Some(Self { syntax })
@@ -2673,28 +2698,6 @@ impl AstNode for LetStmt {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for SelfParam {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == SELF_PARAM }
-    fn cast(syntax: SyntaxNode) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxNode { &self.syntax }
-}
-impl AstNode for Param {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == PARAM }
-    fn cast(syntax: SyntaxNode) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxNode { &self.syntax }
-}
 impl AstNode for PathSegment {
     fn can_cast(kind: SyntaxKind) -> bool { kind == PATH_SEGMENT }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
@@ -2772,11 +2775,11 @@ impl AstNode for MetaItem {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl From<ConstDef> for Item {
-    fn from(node: ConstDef) -> Item { Item::ConstDef(node) }
+impl From<Const> for Item {
+    fn from(node: Const) -> Item { Item::Const(node) }
 }
-impl From<EnumDef> for Item {
-    fn from(node: EnumDef) -> Item { Item::EnumDef(node) }
+impl From<Enum> for Item {
+    fn from(node: Enum) -> Item { Item::Enum(node) }
 }
 impl From<ExternBlock> for Item {
     fn from(node: ExternBlock) -> Item { Item::ExternBlock(node) }
@@ -2784,8 +2787,8 @@ impl From<ExternBlock> for Item {
 impl From<ExternCrate> for Item {
     fn from(node: ExternCrate) -> Item { Item::ExternCrate(node) }
 }
-impl From<FnDef> for Item {
-    fn from(node: FnDef) -> Item { Item::FnDef(node) }
+impl From<Fn> for Item {
+    fn from(node: Fn) -> Item { Item::Fn(node) }
 }
 impl From<ImplDef> for Item {
     fn from(node: ImplDef) -> Item { Item::ImplDef(node) }
@@ -2796,20 +2799,20 @@ impl From<MacroCall> for Item {
 impl From<Module> for Item {
     fn from(node: Module) -> Item { Item::Module(node) }
 }
-impl From<StaticDef> for Item {
-    fn from(node: StaticDef) -> Item { Item::StaticDef(node) }
+impl From<Static> for Item {
+    fn from(node: Static) -> Item { Item::Static(node) }
 }
-impl From<StructDef> for Item {
-    fn from(node: StructDef) -> Item { Item::StructDef(node) }
+impl From<Struct> for Item {
+    fn from(node: Struct) -> Item { Item::Struct(node) }
 }
 impl From<TraitDef> for Item {
     fn from(node: TraitDef) -> Item { Item::TraitDef(node) }
 }
-impl From<TypeAliasDef> for Item {
-    fn from(node: TypeAliasDef) -> Item { Item::TypeAliasDef(node) }
+impl From<TypeAlias> for Item {
+    fn from(node: TypeAlias) -> Item { Item::TypeAlias(node) }
 }
-impl From<UnionDef> for Item {
-    fn from(node: UnionDef) -> Item { Item::UnionDef(node) }
+impl From<Union> for Item {
+    fn from(node: Union) -> Item { Item::Union(node) }
 }
 impl From<Use> for Item {
     fn from(node: Use) -> Item { Item::Use(node) }
@@ -2817,28 +2820,26 @@ impl From<Use> for Item {
 impl AstNode for Item {
     fn can_cast(kind: SyntaxKind) -> bool {
         match kind {
-            CONST_DEF | ENUM_DEF | EXTERN_BLOCK | EXTERN_CRATE | FN_DEF | IMPL_DEF | MACRO_CALL
-            | MODULE | STATIC_DEF | STRUCT_DEF | TRAIT_DEF | TYPE_ALIAS_DEF | UNION_DEF | USE => {
-                true
-            }
+            CONST | ENUM | EXTERN_BLOCK | EXTERN_CRATE | FN | IMPL_DEF | MACRO_CALL | MODULE
+            | STATIC | STRUCT | TRAIT_DEF | TYPE_ALIAS | UNION | USE => true,
             _ => false,
         }
     }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         let res = match syntax.kind() {
-            CONST_DEF => Item::ConstDef(ConstDef { syntax }),
-            ENUM_DEF => Item::EnumDef(EnumDef { syntax }),
+            CONST => Item::Const(Const { syntax }),
+            ENUM => Item::Enum(Enum { syntax }),
             EXTERN_BLOCK => Item::ExternBlock(ExternBlock { syntax }),
             EXTERN_CRATE => Item::ExternCrate(ExternCrate { syntax }),
-            FN_DEF => Item::FnDef(FnDef { syntax }),
+            FN => Item::Fn(Fn { syntax }),
             IMPL_DEF => Item::ImplDef(ImplDef { syntax }),
             MACRO_CALL => Item::MacroCall(MacroCall { syntax }),
             MODULE => Item::Module(Module { syntax }),
-            STATIC_DEF => Item::StaticDef(StaticDef { syntax }),
-            STRUCT_DEF => Item::StructDef(StructDef { syntax }),
+            STATIC => Item::Static(Static { syntax }),
+            STRUCT => Item::Struct(Struct { syntax }),
             TRAIT_DEF => Item::TraitDef(TraitDef { syntax }),
-            TYPE_ALIAS_DEF => Item::TypeAliasDef(TypeAliasDef { syntax }),
-            UNION_DEF => Item::UnionDef(UnionDef { syntax }),
+            TYPE_ALIAS => Item::TypeAlias(TypeAlias { syntax }),
+            UNION => Item::Union(Union { syntax }),
             USE => Item::Use(Use { syntax }),
             _ => return None,
         };
@@ -2846,19 +2847,19 @@ impl AstNode for Item {
     }
     fn syntax(&self) -> &SyntaxNode {
         match self {
-            Item::ConstDef(it) => &it.syntax,
-            Item::EnumDef(it) => &it.syntax,
+            Item::Const(it) => &it.syntax,
+            Item::Enum(it) => &it.syntax,
             Item::ExternBlock(it) => &it.syntax,
             Item::ExternCrate(it) => &it.syntax,
-            Item::FnDef(it) => &it.syntax,
+            Item::Fn(it) => &it.syntax,
             Item::ImplDef(it) => &it.syntax,
             Item::MacroCall(it) => &it.syntax,
             Item::Module(it) => &it.syntax,
-            Item::StaticDef(it) => &it.syntax,
-            Item::StructDef(it) => &it.syntax,
+            Item::Static(it) => &it.syntax,
+            Item::Struct(it) => &it.syntax,
             Item::TraitDef(it) => &it.syntax,
-            Item::TypeAliasDef(it) => &it.syntax,
-            Item::UnionDef(it) => &it.syntax,
+            Item::TypeAlias(it) => &it.syntax,
+            Item::Union(it) => &it.syntax,
             Item::Use(it) => &it.syntax,
         }
     }
@@ -2948,33 +2949,126 @@ impl AstNode for TypeRef {
         }
     }
 }
-impl From<RecordFieldDefList> for FieldDefList {
-    fn from(node: RecordFieldDefList) -> FieldDefList { FieldDefList::RecordFieldDefList(node) }
+impl From<OrPat> for Pat {
+    fn from(node: OrPat) -> Pat { Pat::OrPat(node) }
+}
+impl From<ParenPat> for Pat {
+    fn from(node: ParenPat) -> Pat { Pat::ParenPat(node) }
+}
+impl From<RefPat> for Pat {
+    fn from(node: RefPat) -> Pat { Pat::RefPat(node) }
+}
+impl From<BoxPat> for Pat {
+    fn from(node: BoxPat) -> Pat { Pat::BoxPat(node) }
+}
+impl From<BindPat> for Pat {
+    fn from(node: BindPat) -> Pat { Pat::BindPat(node) }
+}
+impl From<PlaceholderPat> for Pat {
+    fn from(node: PlaceholderPat) -> Pat { Pat::PlaceholderPat(node) }
+}
+impl From<DotDotPat> for Pat {
+    fn from(node: DotDotPat) -> Pat { Pat::DotDotPat(node) }
+}
+impl From<PathPat> for Pat {
+    fn from(node: PathPat) -> Pat { Pat::PathPat(node) }
+}
+impl From<RecordPat> for Pat {
+    fn from(node: RecordPat) -> Pat { Pat::RecordPat(node) }
+}
+impl From<TupleStructPat> for Pat {
+    fn from(node: TupleStructPat) -> Pat { Pat::TupleStructPat(node) }
+}
+impl From<TuplePat> for Pat {
+    fn from(node: TuplePat) -> Pat { Pat::TuplePat(node) }
+}
+impl From<SlicePat> for Pat {
+    fn from(node: SlicePat) -> Pat { Pat::SlicePat(node) }
+}
+impl From<RangePat> for Pat {
+    fn from(node: RangePat) -> Pat { Pat::RangePat(node) }
+}
+impl From<LiteralPat> for Pat {
+    fn from(node: LiteralPat) -> Pat { Pat::LiteralPat(node) }
+}
+impl From<MacroPat> for Pat {
+    fn from(node: MacroPat) -> Pat { Pat::MacroPat(node) }
+}
+impl AstNode for Pat {
+    fn can_cast(kind: SyntaxKind) -> bool {
+        match kind {
+            OR_PAT | PAREN_PAT | REF_PAT | BOX_PAT | BIND_PAT | PLACEHOLDER_PAT | DOT_DOT_PAT
+            | PATH_PAT | RECORD_PAT | TUPLE_STRUCT_PAT | TUPLE_PAT | SLICE_PAT | RANGE_PAT
+            | LITERAL_PAT | MACRO_PAT => true,
+            _ => false,
+        }
+    }
+    fn cast(syntax: SyntaxNode) -> Option<Self> {
+        let res = match syntax.kind() {
+            OR_PAT => Pat::OrPat(OrPat { syntax }),
+            PAREN_PAT => Pat::ParenPat(ParenPat { syntax }),
+            REF_PAT => Pat::RefPat(RefPat { syntax }),
+            BOX_PAT => Pat::BoxPat(BoxPat { syntax }),
+            BIND_PAT => Pat::BindPat(BindPat { syntax }),
+            PLACEHOLDER_PAT => Pat::PlaceholderPat(PlaceholderPat { syntax }),
+            DOT_DOT_PAT => Pat::DotDotPat(DotDotPat { syntax }),
+            PATH_PAT => Pat::PathPat(PathPat { syntax }),
+            RECORD_PAT => Pat::RecordPat(RecordPat { syntax }),
+            TUPLE_STRUCT_PAT => Pat::TupleStructPat(TupleStructPat { syntax }),
+            TUPLE_PAT => Pat::TuplePat(TuplePat { syntax }),
+            SLICE_PAT => Pat::SlicePat(SlicePat { syntax }),
+            RANGE_PAT => Pat::RangePat(RangePat { syntax }),
+            LITERAL_PAT => Pat::LiteralPat(LiteralPat { syntax }),
+            MACRO_PAT => Pat::MacroPat(MacroPat { syntax }),
+            _ => return None,
+        };
+        Some(res)
+    }
+    fn syntax(&self) -> &SyntaxNode {
+        match self {
+            Pat::OrPat(it) => &it.syntax,
+            Pat::ParenPat(it) => &it.syntax,
+            Pat::RefPat(it) => &it.syntax,
+            Pat::BoxPat(it) => &it.syntax,
+            Pat::BindPat(it) => &it.syntax,
+            Pat::PlaceholderPat(it) => &it.syntax,
+            Pat::DotDotPat(it) => &it.syntax,
+            Pat::PathPat(it) => &it.syntax,
+            Pat::RecordPat(it) => &it.syntax,
+            Pat::TupleStructPat(it) => &it.syntax,
+            Pat::TuplePat(it) => &it.syntax,
+            Pat::SlicePat(it) => &it.syntax,
+            Pat::RangePat(it) => &it.syntax,
+            Pat::LiteralPat(it) => &it.syntax,
+            Pat::MacroPat(it) => &it.syntax,
+        }
+    }
+}
+impl From<RecordFieldList> for FieldList {
+    fn from(node: RecordFieldList) -> FieldList { FieldList::RecordFieldList(node) }
 }
-impl From<TupleFieldDefList> for FieldDefList {
-    fn from(node: TupleFieldDefList) -> FieldDefList { FieldDefList::TupleFieldDefList(node) }
+impl From<TupleFieldList> for FieldList {
+    fn from(node: TupleFieldList) -> FieldList { FieldList::TupleFieldList(node) }
 }
-impl AstNode for FieldDefList {
+impl AstNode for FieldList {
     fn can_cast(kind: SyntaxKind) -> bool {
         match kind {
-            RECORD_FIELD_DEF_LIST | TUPLE_FIELD_DEF_LIST => true,
+            RECORD_FIELD_LIST | TUPLE_FIELD_LIST => true,
             _ => false,
         }
     }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         let res = match syntax.kind() {
-            RECORD_FIELD_DEF_LIST => {
-                FieldDefList::RecordFieldDefList(RecordFieldDefList { syntax })
-            }
-            TUPLE_FIELD_DEF_LIST => FieldDefList::TupleFieldDefList(TupleFieldDefList { syntax }),
+            RECORD_FIELD_LIST => FieldList::RecordFieldList(RecordFieldList { syntax }),
+            TUPLE_FIELD_LIST => FieldList::TupleFieldList(TupleFieldList { syntax }),
             _ => return None,
         };
         Some(res)
     }
     fn syntax(&self) -> &SyntaxNode {
         match self {
-            FieldDefList::RecordFieldDefList(it) => &it.syntax,
-            FieldDefList::TupleFieldDefList(it) => &it.syntax,
+            FieldList::RecordFieldList(it) => &it.syntax,
+            FieldList::TupleFieldList(it) => &it.syntax,
         }
     }
 }
@@ -3023,8 +3117,8 @@ impl From<ReturnExpr> for Expr {
 impl From<MatchExpr> for Expr {
     fn from(node: MatchExpr) -> Expr { Expr::MatchExpr(node) }
 }
-impl From<RecordLit> for Expr {
-    fn from(node: RecordLit) -> Expr { Expr::RecordLit(node) }
+impl From<RecordExpr> for Expr {
+    fn from(node: RecordExpr) -> Expr { Expr::RecordExpr(node) }
 }
 impl From<CallExpr> for Expr {
     fn from(node: CallExpr) -> Expr { Expr::CallExpr(node) }
@@ -3076,7 +3170,7 @@ impl AstNode for Expr {
         match kind {
             TUPLE_EXPR | ARRAY_EXPR | PAREN_EXPR | PATH_EXPR | LAMBDA_EXPR | IF_EXPR
             | LOOP_EXPR | FOR_EXPR | WHILE_EXPR | CONTINUE_EXPR | BREAK_EXPR | LABEL
-            | BLOCK_EXPR | RETURN_EXPR | MATCH_EXPR | RECORD_LIT | CALL_EXPR | INDEX_EXPR
+            | BLOCK_EXPR | RETURN_EXPR | MATCH_EXPR | RECORD_EXPR | CALL_EXPR | INDEX_EXPR
             | METHOD_CALL_EXPR | FIELD_EXPR | AWAIT_EXPR | TRY_EXPR | EFFECT_EXPR | CAST_EXPR
             | REF_EXPR | PREFIX_EXPR | RANGE_EXPR | BIN_EXPR | LITERAL | MACRO_CALL | BOX_EXPR => {
                 true
@@ -3101,7 +3195,7 @@ impl AstNode for Expr {
             BLOCK_EXPR => Expr::BlockExpr(BlockExpr { syntax }),
             RETURN_EXPR => Expr::ReturnExpr(ReturnExpr { syntax }),
             MATCH_EXPR => Expr::MatchExpr(MatchExpr { syntax }),
-            RECORD_LIT => Expr::RecordLit(RecordLit { syntax }),
+            RECORD_EXPR => Expr::RecordExpr(RecordExpr { syntax }),
             CALL_EXPR => Expr::CallExpr(CallExpr { syntax }),
             INDEX_EXPR => Expr::IndexExpr(IndexExpr { syntax }),
             METHOD_CALL_EXPR => Expr::MethodCallExpr(MethodCallExpr { syntax }),
@@ -3138,7 +3232,7 @@ impl AstNode for Expr {
             Expr::BlockExpr(it) => &it.syntax,
             Expr::ReturnExpr(it) => &it.syntax,
             Expr::MatchExpr(it) => &it.syntax,
-            Expr::RecordLit(it) => &it.syntax,
+            Expr::RecordExpr(it) => &it.syntax,
             Expr::CallExpr(it) => &it.syntax,
             Expr::IndexExpr(it) => &it.syntax,
             Expr::MethodCallExpr(it) => &it.syntax,
@@ -3157,14 +3251,14 @@ impl AstNode for Expr {
         }
     }
 }
-impl From<FnDef> for AssocItem {
-    fn from(node: FnDef) -> AssocItem { AssocItem::FnDef(node) }
+impl From<Fn> for AssocItem {
+    fn from(node: Fn) -> AssocItem { AssocItem::Fn(node) }
 }
-impl From<TypeAliasDef> for AssocItem {
-    fn from(node: TypeAliasDef) -> AssocItem { AssocItem::TypeAliasDef(node) }
+impl From<TypeAlias> for AssocItem {
+    fn from(node: TypeAlias) -> AssocItem { AssocItem::TypeAlias(node) }
 }
-impl From<ConstDef> for AssocItem {
-    fn from(node: ConstDef) -> AssocItem { AssocItem::ConstDef(node) }
+impl From<Const> for AssocItem {
+    fn from(node: Const) -> AssocItem { AssocItem::Const(node) }
 }
 impl From<MacroCall> for AssocItem {
     fn from(node: MacroCall) -> AssocItem { AssocItem::MacroCall(node) }
@@ -3172,15 +3266,15 @@ impl From<MacroCall> for AssocItem {
 impl AstNode for AssocItem {
     fn can_cast(kind: SyntaxKind) -> bool {
         match kind {
-            FN_DEF | TYPE_ALIAS_DEF | CONST_DEF | MACRO_CALL => true,
+            FN | TYPE_ALIAS | CONST | MACRO_CALL => true,
             _ => false,
         }
     }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         let res = match syntax.kind() {
-            FN_DEF => AssocItem::FnDef(FnDef { syntax }),
-            TYPE_ALIAS_DEF => AssocItem::TypeAliasDef(TypeAliasDef { syntax }),
-            CONST_DEF => AssocItem::ConstDef(ConstDef { syntax }),
+            FN => AssocItem::Fn(Fn { syntax }),
+            TYPE_ALIAS => AssocItem::TypeAlias(TypeAlias { syntax }),
+            CONST => AssocItem::Const(Const { syntax }),
             MACRO_CALL => AssocItem::MacroCall(MacroCall { syntax }),
             _ => return None,
         };
@@ -3188,108 +3282,13 @@ impl AstNode for AssocItem {
     }
     fn syntax(&self) -> &SyntaxNode {
         match self {
-            AssocItem::FnDef(it) => &it.syntax,
-            AssocItem::TypeAliasDef(it) => &it.syntax,
-            AssocItem::ConstDef(it) => &it.syntax,
+            AssocItem::Fn(it) => &it.syntax,
+            AssocItem::TypeAlias(it) => &it.syntax,
+            AssocItem::Const(it) => &it.syntax,
             AssocItem::MacroCall(it) => &it.syntax,
         }
     }
 }
-impl From<OrPat> for Pat {
-    fn from(node: OrPat) -> Pat { Pat::OrPat(node) }
-}
-impl From<ParenPat> for Pat {
-    fn from(node: ParenPat) -> Pat { Pat::ParenPat(node) }
-}
-impl From<RefPat> for Pat {
-    fn from(node: RefPat) -> Pat { Pat::RefPat(node) }
-}
-impl From<BoxPat> for Pat {
-    fn from(node: BoxPat) -> Pat { Pat::BoxPat(node) }
-}
-impl From<BindPat> for Pat {
-    fn from(node: BindPat) -> Pat { Pat::BindPat(node) }
-}
-impl From<PlaceholderPat> for Pat {
-    fn from(node: PlaceholderPat) -> Pat { Pat::PlaceholderPat(node) }
-}
-impl From<DotDotPat> for Pat {
-    fn from(node: DotDotPat) -> Pat { Pat::DotDotPat(node) }
-}
-impl From<PathPat> for Pat {
-    fn from(node: PathPat) -> Pat { Pat::PathPat(node) }
-}
-impl From<RecordPat> for Pat {
-    fn from(node: RecordPat) -> Pat { Pat::RecordPat(node) }
-}
-impl From<TupleStructPat> for Pat {
-    fn from(node: TupleStructPat) -> Pat { Pat::TupleStructPat(node) }
-}
-impl From<TuplePat> for Pat {
-    fn from(node: TuplePat) -> Pat { Pat::TuplePat(node) }
-}
-impl From<SlicePat> for Pat {
-    fn from(node: SlicePat) -> Pat { Pat::SlicePat(node) }
-}
-impl From<RangePat> for Pat {
-    fn from(node: RangePat) -> Pat { Pat::RangePat(node) }
-}
-impl From<LiteralPat> for Pat {
-    fn from(node: LiteralPat) -> Pat { Pat::LiteralPat(node) }
-}
-impl From<MacroPat> for Pat {
-    fn from(node: MacroPat) -> Pat { Pat::MacroPat(node) }
-}
-impl AstNode for Pat {
-    fn can_cast(kind: SyntaxKind) -> bool {
-        match kind {
-            OR_PAT | PAREN_PAT | REF_PAT | BOX_PAT | BIND_PAT | PLACEHOLDER_PAT | DOT_DOT_PAT
-            | PATH_PAT | RECORD_PAT | TUPLE_STRUCT_PAT | TUPLE_PAT | SLICE_PAT | RANGE_PAT
-            | LITERAL_PAT | MACRO_PAT => true,
-            _ => false,
-        }
-    }
-    fn cast(syntax: SyntaxNode) -> Option<Self> {
-        let res = match syntax.kind() {
-            OR_PAT => Pat::OrPat(OrPat { syntax }),
-            PAREN_PAT => Pat::ParenPat(ParenPat { syntax }),
-            REF_PAT => Pat::RefPat(RefPat { syntax }),
-            BOX_PAT => Pat::BoxPat(BoxPat { syntax }),
-            BIND_PAT => Pat::BindPat(BindPat { syntax }),
-            PLACEHOLDER_PAT => Pat::PlaceholderPat(PlaceholderPat { syntax }),
-            DOT_DOT_PAT => Pat::DotDotPat(DotDotPat { syntax }),
-            PATH_PAT => Pat::PathPat(PathPat { syntax }),
-            RECORD_PAT => Pat::RecordPat(RecordPat { syntax }),
-            TUPLE_STRUCT_PAT => Pat::TupleStructPat(TupleStructPat { syntax }),
-            TUPLE_PAT => Pat::TuplePat(TuplePat { syntax }),
-            SLICE_PAT => Pat::SlicePat(SlicePat { syntax }),
-            RANGE_PAT => Pat::RangePat(RangePat { syntax }),
-            LITERAL_PAT => Pat::LiteralPat(LiteralPat { syntax }),
-            MACRO_PAT => Pat::MacroPat(MacroPat { syntax }),
-            _ => return None,
-        };
-        Some(res)
-    }
-    fn syntax(&self) -> &SyntaxNode {
-        match self {
-            Pat::OrPat(it) => &it.syntax,
-            Pat::ParenPat(it) => &it.syntax,
-            Pat::RefPat(it) => &it.syntax,
-            Pat::BoxPat(it) => &it.syntax,
-            Pat::BindPat(it) => &it.syntax,
-            Pat::PlaceholderPat(it) => &it.syntax,
-            Pat::DotDotPat(it) => &it.syntax,
-            Pat::PathPat(it) => &it.syntax,
-            Pat::RecordPat(it) => &it.syntax,
-            Pat::TupleStructPat(it) => &it.syntax,
-            Pat::TuplePat(it) => &it.syntax,
-            Pat::SlicePat(it) => &it.syntax,
-            Pat::RangePat(it) => &it.syntax,
-            Pat::LiteralPat(it) => &it.syntax,
-            Pat::MacroPat(it) => &it.syntax,
-        }
-    }
-}
 impl From<LetStmt> for Stmt {
     fn from(node: LetStmt) -> Stmt { Stmt::LetStmt(node) }
 }
@@ -3346,64 +3345,64 @@ impl AstNode for AttrInput {
         }
     }
 }
-impl From<FnDef> for ExternItem {
-    fn from(node: FnDef) -> ExternItem { ExternItem::FnDef(node) }
+impl From<Fn> for ExternItem {
+    fn from(node: Fn) -> ExternItem { ExternItem::Fn(node) }
 }
-impl From<StaticDef> for ExternItem {
-    fn from(node: StaticDef) -> ExternItem { ExternItem::StaticDef(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_DEF | STATIC_DEF => true,
+            FN | STATIC => true,
             _ => false,
         }
     }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         let res = match syntax.kind() {
-            FN_DEF => ExternItem::FnDef(FnDef { syntax }),
-            STATIC_DEF => ExternItem::StaticDef(StaticDef { syntax }),
+            FN => ExternItem::Fn(Fn { syntax }),
+            STATIC => ExternItem::Static(Static { syntax }),
             _ => return None,
         };
         Some(res)
     }
     fn syntax(&self) -> &SyntaxNode {
         match self {
-            ExternItem::FnDef(it) => &it.syntax,
-            ExternItem::StaticDef(it) => &it.syntax,
+            ExternItem::Fn(it) => &it.syntax,
+            ExternItem::Static(it) => &it.syntax,
         }
     }
 }
-impl From<StructDef> for AdtDef {
-    fn from(node: StructDef) -> AdtDef { AdtDef::StructDef(node) }
+impl From<Struct> for AdtDef {
+    fn from(node: Struct) -> AdtDef { AdtDef::Struct(node) }
 }
-impl From<EnumDef> for AdtDef {
-    fn from(node: EnumDef) -> AdtDef { AdtDef::EnumDef(node) }
+impl From<Enum> for AdtDef {
+    fn from(node: Enum) -> AdtDef { AdtDef::Enum(node) }
 }
-impl From<UnionDef> for AdtDef {
-    fn from(node: UnionDef) -> AdtDef { AdtDef::UnionDef(node) }
+impl From<Union> for AdtDef {
+    fn from(node: Union) -> AdtDef { AdtDef::Union(node) }
 }
 impl AstNode for AdtDef {
     fn can_cast(kind: SyntaxKind) -> bool {
         match kind {
-            STRUCT_DEF | ENUM_DEF | UNION_DEF => true,
+            STRUCT | ENUM | UNION => true,
             _ => false,
         }
     }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         let res = match syntax.kind() {
-            STRUCT_DEF => AdtDef::StructDef(StructDef { syntax }),
-            ENUM_DEF => AdtDef::EnumDef(EnumDef { syntax }),
-            UNION_DEF => AdtDef::UnionDef(UnionDef { syntax }),
+            STRUCT => AdtDef::Struct(Struct { syntax }),
+            ENUM => AdtDef::Enum(Enum { syntax }),
+            UNION => AdtDef::Union(Union { syntax }),
             _ => return None,
         };
         Some(res)
     }
     fn syntax(&self) -> &SyntaxNode {
         match self {
-            AdtDef::StructDef(it) => &it.syntax,
-            AdtDef::EnumDef(it) => &it.syntax,
-            AdtDef::UnionDef(it) => &it.syntax,
+            AdtDef::Struct(it) => &it.syntax,
+            AdtDef::Enum(it) => &it.syntax,
+            AdtDef::Union(it) => &it.syntax,
         }
     }
 }
@@ -3417,22 +3416,22 @@ impl std::fmt::Display for TypeRef {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for FieldDefList {
+impl std::fmt::Display for Pat {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for Expr {
+impl std::fmt::Display for FieldList {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for AssocItem {
+impl std::fmt::Display for Expr {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for Pat {
+impl std::fmt::Display for AssocItem {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
     }
@@ -3467,12 +3466,12 @@ impl std::fmt::Display for Attr {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for ConstDef {
+impl std::fmt::Display for Const {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for EnumDef {
+impl std::fmt::Display for Enum {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
     }
@@ -3487,7 +3486,7 @@ impl std::fmt::Display for ExternCrate {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for FnDef {
+impl std::fmt::Display for Fn {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
     }
@@ -3507,12 +3506,12 @@ impl std::fmt::Display for Module {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for StaticDef {
+impl std::fmt::Display for Static {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for StructDef {
+impl std::fmt::Display for Struct {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
     }
@@ -3522,12 +3521,12 @@ impl std::fmt::Display for TraitDef {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for TypeAliasDef {
+impl std::fmt::Display for TypeAlias {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for UnionDef {
+impl std::fmt::Display for Union {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
     }
@@ -3582,7 +3581,7 @@ impl std::fmt::Display for Abi {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for TypeParamList {
+impl std::fmt::Display for GenericParamList {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
     }
@@ -3607,37 +3606,47 @@ impl std::fmt::Display for BlockExpr {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for RecordFieldDefList {
+impl std::fmt::Display for Param {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for TupleFieldDefList {
+impl std::fmt::Display for SelfParam {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for RecordFieldDef {
+impl std::fmt::Display for TypeBoundList {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for TupleFieldDef {
+impl std::fmt::Display for RecordFieldList {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for EnumVariantList {
+impl std::fmt::Display for TupleFieldList {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for EnumVariant {
+impl std::fmt::Display for RecordField {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for TypeBoundList {
+impl std::fmt::Display for TupleField {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        std::fmt::Display::fmt(self.syntax(), f)
+    }
+}
+impl std::fmt::Display for VariantList {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        std::fmt::Display::fmt(self.syntax(), f)
+    }
+}
+impl std::fmt::Display for Variant {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
     }
@@ -3882,17 +3891,17 @@ impl std::fmt::Display for MatchGuard {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for RecordLit {
+impl std::fmt::Display for RecordExpr {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for RecordFieldList {
+impl std::fmt::Display for RecordExprFieldList {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for RecordField {
+impl std::fmt::Display for RecordExprField {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
     }
@@ -4037,16 +4046,6 @@ impl std::fmt::Display for LetStmt {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for SelfParam {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        std::fmt::Display::fmt(self.syntax(), f)
-    }
-}
-impl std::fmt::Display for Param {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        std::fmt::Display::fmt(self.syntax(), f)
-    }
-}
 impl std::fmt::Display for PathSegment {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
diff --git a/crates/ra_syntax/src/ast/make.rs b/crates/ra_syntax/src/ast/make.rs
index 0ff69bc2d..509e8ae7a 100644
--- a/crates/ra_syntax/src/ast/make.rs
+++ b/crates/ra_syntax/src/ast/make.rs
@@ -64,18 +64,18 @@ pub fn use_item(use_tree: ast::UseTree) -> ast::Use {
     ast_from_text(&format!("use {};", use_tree))
 }
 
-pub fn record_field(name: ast::NameRef, expr: Option<ast::Expr>) -> ast::RecordField {
+pub fn record_field(name: ast::NameRef, expr: Option<ast::Expr>) -> ast::RecordExprField {
     return match expr {
         Some(expr) => from_text(&format!("{}: {}", name, expr)),
         None => from_text(&name.to_string()),
     };
 
-    fn from_text(text: &str) -> ast::RecordField {
+    fn from_text(text: &str) -> ast::RecordExprField {
         ast_from_text(&format!("fn f() {{ S {{ {}, }} }}", text))
     }
 }
 
-pub fn record_field_def(name: ast::NameRef, ty: ast::TypeRef) -> ast::RecordFieldDef {
+pub fn record_field_def(name: ast::NameRef, ty: ast::TypeRef) -> ast::RecordField {
     ast_from_text(&format!("struct S {{ {}: {}, }}", name, ty))
 }
 
@@ -291,10 +291,10 @@ pub fn visibility_pub_crate() -> ast::Visibility {
 pub fn fn_def(
     visibility: Option<ast::Visibility>,
     fn_name: ast::Name,
-    type_params: Option<ast::TypeParamList>,
+    type_params: Option<ast::GenericParamList>,
     params: ast::ParamList,
     body: ast::BlockExpr,
-) -> ast::FnDef {
+) -> ast::Fn {
     let type_params =
         if let Some(type_params) = type_params { format!("<{}>", type_params) } else { "".into() };
     let visibility = match visibility {
diff --git a/crates/ra_syntax/src/ast/node_ext.rs b/crates/ra_syntax/src/ast/node_ext.rs
index 242900643..4da1d5c11 100644
--- a/crates/ra_syntax/src/ast/node_ext.rs
+++ b/crates/ra_syntax/src/ast/node_ext.rs
@@ -166,16 +166,16 @@ impl ast::ImplDef {
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum StructKind {
-    Record(ast::RecordFieldDefList),
-    Tuple(ast::TupleFieldDefList),
+    Record(ast::RecordFieldList),
+    Tuple(ast::TupleFieldList),
     Unit,
 }
 
 impl StructKind {
     fn from_node<N: AstNode>(node: &N) -> StructKind {
-        if let Some(nfdl) = support::child::<ast::RecordFieldDefList>(node.syntax()) {
+        if let Some(nfdl) = support::child::<ast::RecordFieldList>(node.syntax()) {
             StructKind::Record(nfdl)
-        } else if let Some(pfl) = support::child::<ast::TupleFieldDefList>(node.syntax()) {
+        } else if let Some(pfl) = support::child::<ast::TupleFieldList>(node.syntax()) {
             StructKind::Tuple(pfl)
         } else {
             StructKind::Unit
@@ -183,17 +183,17 @@ impl StructKind {
     }
 }
 
-impl ast::StructDef {
+impl ast::Struct {
     pub fn kind(&self) -> StructKind {
         StructKind::from_node(self)
     }
 }
 
-impl ast::RecordField {
-    pub fn for_field_name(field_name: &ast::NameRef) -> Option<ast::RecordField> {
+impl ast::RecordExprField {
+    pub fn for_field_name(field_name: &ast::NameRef) -> Option<ast::RecordExprField> {
         let candidate =
-            field_name.syntax().parent().and_then(ast::RecordField::cast).or_else(|| {
-                field_name.syntax().ancestors().nth(4).and_then(ast::RecordField::cast)
+            field_name.syntax().parent().and_then(ast::RecordExprField::cast).or_else(|| {
+                field_name.syntax().ancestors().nth(4).and_then(ast::RecordExprField::cast)
             })?;
         if candidate.field_name().as_ref() == Some(field_name) {
             Some(candidate)
@@ -247,12 +247,12 @@ impl ast::RecordFieldPat {
     }
 }
 
-impl ast::EnumVariant {
-    pub fn parent_enum(&self) -> ast::EnumDef {
+impl ast::Variant {
+    pub fn parent_enum(&self) -> ast::Enum {
         self.syntax()
             .parent()
             .and_then(|it| it.parent())
-            .and_then(ast::EnumDef::cast)
+            .and_then(ast::Enum::cast)
             .expect("EnumVariants are always nested in Enums")
     }
     pub fn kind(&self) -> StructKind {
@@ -474,17 +474,17 @@ impl ast::TokenTree {
 }
 
 impl ast::DocCommentsOwner for ast::SourceFile {}
-impl ast::DocCommentsOwner for ast::FnDef {}
-impl ast::DocCommentsOwner for ast::StructDef {}
-impl ast::DocCommentsOwner for ast::UnionDef {}
-impl ast::DocCommentsOwner for ast::RecordFieldDef {}
-impl ast::DocCommentsOwner for ast::TupleFieldDef {}
-impl ast::DocCommentsOwner for ast::EnumDef {}
-impl ast::DocCommentsOwner for ast::EnumVariant {}
+impl ast::DocCommentsOwner for ast::Fn {}
+impl ast::DocCommentsOwner for ast::Struct {}
+impl ast::DocCommentsOwner for ast::Union {}
+impl ast::DocCommentsOwner for ast::RecordField {}
+impl ast::DocCommentsOwner for ast::TupleField {}
+impl ast::DocCommentsOwner for ast::Enum {}
+impl ast::DocCommentsOwner for ast::Variant {}
 impl ast::DocCommentsOwner for ast::TraitDef {}
 impl ast::DocCommentsOwner for ast::Module {}
-impl ast::DocCommentsOwner for ast::StaticDef {}
-impl ast::DocCommentsOwner for ast::ConstDef {}
-impl ast::DocCommentsOwner for ast::TypeAliasDef {}
+impl ast::DocCommentsOwner for ast::Static {}
+impl ast::DocCommentsOwner for ast::Const {}
+impl ast::DocCommentsOwner for ast::TypeAlias {}
 impl ast::DocCommentsOwner for ast::ImplDef {}
 impl ast::DocCommentsOwner for ast::MacroCall {}
diff --git a/crates/ra_syntax/src/ast/traits.rs b/crates/ra_syntax/src/ast/traits.rs
index 9fe0b93c1..113bd5d82 100644
--- a/crates/ra_syntax/src/ast/traits.rs
+++ b/crates/ra_syntax/src/ast/traits.rs
@@ -49,8 +49,8 @@ pub trait ModuleItemOwner: AstNode {
     }
 }
 
-pub trait TypeParamsOwner: AstNode {
-    fn type_param_list(&self) -> Option<ast::TypeParamList> {
+pub trait GenericParamsOwner: AstNode {
+    fn generic_param_list(&self) -> Option<ast::GenericParamList> {
         support::child(self.syntax())
     }
 
diff --git a/crates/ra_syntax/src/lib.rs b/crates/ra_syntax/src/lib.rs
index 219dd0b07..6203b6206 100644
--- a/crates/ra_syntax/src/lib.rs
+++ b/crates/ra_syntax/src/lib.rs
@@ -255,11 +255,11 @@ fn api_walkthrough() {
     let mut func = None;
     for item in file.items() {
         match item {
-            ast::Item::FnDef(f) => func = Some(f),
+            ast::Item::Fn(f) => func = Some(f),
             _ => unreachable!(),
         }
     }
-    let func: ast::FnDef = func.unwrap();
+    let func: ast::Fn = func.unwrap();
 
     // Each AST node has a bunch of getters for children. All getters return
     // `Option`s though, to account for incomplete code. Some getters are common
@@ -316,7 +316,7 @@ fn api_walkthrough() {
     );
 
     // As well as some iterator helpers:
-    let f = expr_syntax.ancestors().find_map(ast::FnDef::cast);
+    let f = expr_syntax.ancestors().find_map(ast::Fn::cast);
     assert_eq!(f, Some(func));
     assert!(expr_syntax.siblings_with_tokens(Direction::Next).any(|it| it.kind() == T!['}']));
     assert_eq!(
diff --git a/crates/ra_syntax/src/parsing/text_tree_sink.rs b/crates/ra_syntax/src/parsing/text_tree_sink.rs
index c6b30a02a..95581a84b 100644
--- a/crates/ra_syntax/src/parsing/text_tree_sink.rs
+++ b/crates/ra_syntax/src/parsing/text_tree_sink.rs
@@ -146,8 +146,8 @@ fn n_attached_trivias<'a>(
     trivias: impl Iterator<Item = (SyntaxKind, &'a str)>,
 ) -> usize {
     match kind {
-        MACRO_CALL | CONST_DEF | TYPE_ALIAS_DEF | STRUCT_DEF | ENUM_DEF | ENUM_VARIANT | FN_DEF
-        | TRAIT_DEF | MODULE | RECORD_FIELD_DEF | STATIC_DEF => {
+        MACRO_CALL | CONST | TYPE_ALIAS | STRUCT | ENUM | VARIANT | FN | TRAIT_DEF | MODULE
+        | RECORD_FIELD | STATIC => {
             let mut res = 0;
             let mut trivias = trivias.enumerate().peekable();
 
diff --git a/crates/ra_syntax/src/ptr.rs b/crates/ra_syntax/src/ptr.rs
index 62f03e93d..ca7957747 100644
--- a/crates/ra_syntax/src/ptr.rs
+++ b/crates/ra_syntax/src/ptr.rs
@@ -98,7 +98,7 @@ fn test_local_syntax_ptr() {
     use crate::{ast, AstNode, SourceFile};
 
     let file = SourceFile::parse("struct Foo { f: u32, }").ok().unwrap();
-    let field = file.syntax().descendants().find_map(ast::RecordFieldDef::cast).unwrap();
+    let field = file.syntax().descendants().find_map(ast::RecordField::cast).unwrap();
     let ptr = SyntaxNodePtr::new(field.syntax());
     let field_syntax = ptr.to_node(file.syntax());
     assert_eq!(field.syntax(), &field_syntax);
diff --git a/crates/ra_syntax/src/validation.rs b/crates/ra_syntax/src/validation.rs
index fdec48fb0..a666b18db 100644
--- a/crates/ra_syntax/src/validation.rs
+++ b/crates/ra_syntax/src/validation.rs
@@ -4,7 +4,7 @@ mod block;
 
 use crate::{
     ast, match_ast, AstNode, SyntaxError,
-    SyntaxKind::{BYTE, BYTE_STRING, CHAR, CONST_DEF, FN_DEF, INT_NUMBER, STRING, TYPE_ALIAS_DEF},
+    SyntaxKind::{BYTE, BYTE_STRING, CHAR, CONST, FN, INT_NUMBER, STRING, TYPE_ALIAS},
     SyntaxNode, SyntaxToken, TextSize, T,
 };
 use rustc_lexer::unescape::{
@@ -91,7 +91,7 @@ pub(crate) fn validate(root: &SyntaxNode) -> Vec<SyntaxError> {
                 ast::Literal(it) => validate_literal(it, &mut errors),
                 ast::BlockExpr(it) => block::validate_block_expr(it, &mut errors),
                 ast::FieldExpr(it) => validate_numeric_name(it.name_ref(), &mut errors),
-                ast::RecordField(it) => validate_numeric_name(it.name_ref(), &mut errors),
+                ast::RecordExprField(it) => validate_numeric_name(it.name_ref(), &mut errors),
                 ast::Visibility(it) => validate_visibility(it, &mut errors),
                 ast::RangeExpr(it) => validate_range_expr(it, &mut errors),
                 ast::PathSegment(it) => validate_path_keywords(it, &mut errors),
@@ -200,7 +200,7 @@ fn validate_visibility(vis: ast::Visibility, errors: &mut Vec<SyntaxError>) {
         None => return,
     };
     match parent.kind() {
-        FN_DEF | CONST_DEF | TYPE_ALIAS_DEF => (),
+        FN | CONST | TYPE_ALIAS => (),
         _ => return,
     }
 
diff --git a/crates/ra_syntax/src/validation/block.rs b/crates/ra_syntax/src/validation/block.rs
index 2c08f7e6e..ad9901468 100644
--- a/crates/ra_syntax/src/validation/block.rs
+++ b/crates/ra_syntax/src/validation/block.rs
@@ -9,7 +9,7 @@ use crate::{
 pub(crate) fn validate_block_expr(block: ast::BlockExpr, errors: &mut Vec<SyntaxError>) {
     if let Some(parent) = block.syntax().parent() {
         match parent.kind() {
-            FN_DEF | EXPR_STMT | BLOCK_EXPR => return,
+            FN | EXPR_STMT | BLOCK_EXPR => return,
             _ => {}
         }
     }
diff --git a/crates/ra_syntax/test_data/parser/err/0000_struct_field_missing_comma.rast b/crates/ra_syntax/test_data/parser/err/0000_struct_field_missing_comma.rast
index 81f0f575c..bbbf496c8 100644
--- a/crates/ra_syntax/test_data/parser/err/0000_struct_field_missing_comma.rast
+++ b/crates/ra_syntax/test_data/parser/err/0000_struct_field_missing_comma.rast
@@ -1,14 +1,14 @@
 [email protected]
-  STRUCT_DEF@0..34
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "S"
     [email protected] " "
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      RECORD_FIELD_DEF@15..21
+      [email protected]
         [email protected]
           [email protected] "a"
         [email protected] ":"
@@ -19,7 +19,7 @@ [email protected]
               [email protected]
                 [email protected] "u32"
       [email protected] "\n    "
-      RECORD_FIELD_DEF@26..32
+      [email protected]
         [email protected]
           [email protected] "b"
         [email protected] ":"
diff --git a/crates/ra_syntax/test_data/parser/err/0001_item_recovery_in_file.rast b/crates/ra_syntax/test_data/parser/err/0001_item_recovery_in_file.rast
index 97d0fe910..6dc73bfdb 100644
--- a/crates/ra_syntax/test_data/parser/err/0001_item_recovery_in_file.rast
+++ b/crates/ra_syntax/test_data/parser/err/0001_item_recovery_in_file.rast
@@ -5,13 +5,13 @@ [email protected]
   [email protected]
     [email protected] "match"
   [email protected] "\n\n"
-  STRUCT_DEF@10..21
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "S"
     [email protected] " "
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "{"
       [email protected] "}"
 error 0..0: expected an item
diff --git a/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.rast b/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.rast
index 21c255698..7763fad84 100644
--- a/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.rast
+++ b/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.rast
@@ -1,14 +1,14 @@
 [email protected]
-  STRUCT_DEF@0..39
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "S"
     [email protected] " "
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      RECORD_FIELD_DEF@15..21
+      [email protected]
         [email protected]
           [email protected] "a"
         [email protected] ":"
@@ -20,7 +20,7 @@ [email protected]
                 [email protected] "i32"
       [email protected] ","
       [email protected] "\n    "
-      RECORD_FIELD_DEF@27..36
+      [email protected]
         [email protected]
           [email protected] "b"
         [email protected] ":"
diff --git a/crates/ra_syntax/test_data/parser/err/0005_attribute_recover.rast b/crates/ra_syntax/test_data/parser/err/0005_attribute_recover.rast
index 375ed45e0..4845a6563 100644
--- a/crates/ra_syntax/test_data/parser/err/0005_attribute_recover.rast
+++ b/crates/ra_syntax/test_data/parser/err/0005_attribute_recover.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..31
+  [email protected]
     [email protected]
       [email protected] "#"
       [email protected] "["
diff --git a/crates/ra_syntax/test_data/parser/err/0006_named_field_recovery.rast b/crates/ra_syntax/test_data/parser/err/0006_named_field_recovery.rast
index 2d6364998..5f85c3943 100644
--- a/crates/ra_syntax/test_data/parser/err/0006_named_field_recovery.rast
+++ b/crates/ra_syntax/test_data/parser/err/0006_named_field_recovery.rast
@@ -1,14 +1,14 @@
 [email protected]
-  STRUCT_DEF@0..73
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "S"
     [email protected] " "
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      RECORD_FIELD_DEF@15..21
+      [email protected]
         [email protected]
           [email protected] "f"
         [email protected] ":"
@@ -35,7 +35,7 @@ [email protected]
       [email protected]
         [email protected] "*"
       [email protected] "\n    "
-      RECORD_FIELD_DEF@48..58
+      [email protected]
         [email protected]
           [email protected] "pub"
         [email protected] " "
@@ -50,7 +50,7 @@ [email protected]
                 [email protected] "u32"
       [email protected] ","
       [email protected] "\n    "
-      RECORD_FIELD_DEF@64..70
+      [email protected]
         [email protected]
           [email protected] "z"
         [email protected] ":"
diff --git a/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast b/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast
index b72c92c33..560bfd751 100644
--- a/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast
+++ b/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast
@@ -2,7 +2,7 @@ [email protected]
   [email protected]
     [email protected] "}"
   [email protected] "\n\n"
-  STRUCT_DEF@3..12
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
@@ -12,7 +12,7 @@ [email protected]
   [email protected]
     [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@17..27
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rast b/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rast
index 33953d8d7..1e9637c26 100644
--- a/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rast
+++ b/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..12
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -58,7 +58,7 @@ [email protected]
     [email protected] "\n"
     [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@82..94
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0009_broken_struct_type_parameter.rast b/crates/ra_syntax/test_data/parser/err/0009_broken_struct_type_parameter.rast
index aca02ece4..dacf71aa1 100644
--- a/crates/ra_syntax/test_data/parser/err/0009_broken_struct_type_parameter.rast
+++ b/crates/ra_syntax/test_data/parser/err/0009_broken_struct_type_parameter.rast
@@ -1,10 +1,10 @@
 [email protected]
-  STRUCT_DEF@0..11
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "S"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected] "90"
@@ -38,7 +38,7 @@ [email protected]
     [email protected] "\n"
     [email protected] "}"
   [email protected] "\n\n"
-  STRUCT_DEF@33..42
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rast b/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rast
index 3bf57eacc..1c3e0f65b 100644
--- a/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rast
+++ b/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..41
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0011_extern_struct.rast b/crates/ra_syntax/test_data/parser/err/0011_extern_struct.rast
index 87c54c32c..b02d390af 100644
--- a/crates/ra_syntax/test_data/parser/err/0011_extern_struct.rast
+++ b/crates/ra_syntax/test_data/parser/err/0011_extern_struct.rast
@@ -3,7 +3,7 @@ [email protected]
     [email protected]
       [email protected] "extern"
   [email protected] " "
-  STRUCT_DEF@7..18
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
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 e1e782f5f..d62906b99 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
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..389
+  [email protected]
     [email protected]
       [email protected]
       [email protected]
@@ -10,7 +10,7 @@ [email protected]
     [email protected]
     [email protected]
       [email protected] "process"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected]
       [email protected]
         [email protected] "'a"
diff --git a/crates/ra_syntax/test_data/parser/err/0013_invalid_type.rast b/crates/ra_syntax/test_data/parser/err/0013_invalid_type.rast
index 211e5fd46..3eef848fc 100644
--- a/crates/ra_syntax/test_data/parser/err/0013_invalid_type.rast
+++ b/crates/ra_syntax/test_data/parser/err/0013_invalid_type.rast
@@ -1,5 +1,5 @@
 [email protected]
-  STRUCT_DEF@0..72
+  [email protected]
     [email protected]
       [email protected] "pub"
     [email protected] " "
@@ -7,10 +7,10 @@ [email protected]
     [email protected] " "
     [email protected]
       [email protected] "Cache"
-    TUPLE_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "("
       [email protected] "\n    "
-      TUPLE_FIELD_DEF@22..68
+      [email protected]
         [email protected]
           [email protected]
             [email protected]
@@ -47,7 +47,7 @@ [email protected]
                                       [email protected]
                                         [email protected] "@"
       [email protected] " "
-      TUPLE_FIELD_DEF@69..72
+      [email protected]
         [email protected]
           [email protected]
             [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.rast b/crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.rast
index 9323b7890..a1f39b22a 100644
--- a/crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.rast
+++ b/crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.rast
@@ -1,10 +1,10 @@
 [email protected]
-  FN_DEF@0..22
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
       [email protected] "foo"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0015_curly_in_params.rast b/crates/ra_syntax/test_data/parser/err/0015_curly_in_params.rast
index b18378cff..a3c25b450 100644
--- a/crates/ra_syntax/test_data/parser/err/0015_curly_in_params.rast
+++ b/crates/ra_syntax/test_data/parser/err/0015_curly_in_params.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..7
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0016_missing_semi.rast b/crates/ra_syntax/test_data/parser/err/0016_missing_semi.rast
index 93434f34f..66157c3dc 100644
--- a/crates/ra_syntax/test_data/parser/err/0016_missing_semi.rast
+++ b/crates/ra_syntax/test_data/parser/err/0016_missing_semi.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..55
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rast b/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rast
index 628315c78..bb4a28f4e 100644
--- a/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rast
+++ b/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..46
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast b/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast
index a87e5061a..1ce5f188f 100644
--- a/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast
+++ b/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast
@@ -11,7 +11,7 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      FN_DEF@20..161
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -75,16 +75,16 @@ [email protected]
               [email protected] "push"
             [email protected]
               [email protected] "("
-              RECORD_LIT@111..154
+              RECORD_EXPR@111..154
                 [email protected]
                   [email protected]
                     [email protected]
                       [email protected] "ScopeData"
                 [email protected] " "
-                [email protected]
+                RECORD_EXPR_[email protected]
                   [email protected] "{"
                   [email protected] " "
-                  [email protected]
+                  RECORD_EXPR_[email protected]
                     [email protected]
                       [email protected] "parent"
                     [email protected] ":"
@@ -96,7 +96,7 @@ [email protected]
                             [email protected] "None"
                   [email protected] ","
                   [email protected] " "
-                  [email protected]
+                  RECORD_EXPR_[email protected]
                     [email protected]
                       [email protected] "entries"
                     [email protected] ":"
@@ -116,7 +116,7 @@ [email protected]
           [email protected] "\n    "
           [email protected] "}"
       [email protected] "\n\n    "
-      FN_DEF@167..180
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0019_let_recover.rast b/crates/ra_syntax/test_data/parser/err/0019_let_recover.rast
index 4ff27f5c8..f6fa964b7 100644
--- a/crates/ra_syntax/test_data/parser/err/0019_let_recover.rast
+++ b/crates/ra_syntax/test_data/parser/err/0019_let_recover.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..138
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0020_fn_recover.rast b/crates/ra_syntax/test_data/parser/err/0020_fn_recover.rast
index 5f3a31473..6f6feba5a 100644
--- a/crates/ra_syntax/test_data/parser/err/0020_fn_recover.rast
+++ b/crates/ra_syntax/test_data/parser/err/0020_fn_recover.rast
@@ -1,8 +1,8 @@
 [email protected]
-  FN_DEF@0..2
+  [email protected]
     [email protected] "fn"
   [email protected] "\n\n"
-  FN_DEF@4..15
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0021_incomplete_param.rast b/crates/ra_syntax/test_data/parser/err/0021_incomplete_param.rast
index 1746bd3c1..ba4ce4795 100644
--- a/crates/ra_syntax/test_data/parser/err/0021_incomplete_param.rast
+++ b/crates/ra_syntax/test_data/parser/err/0021_incomplete_param.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..21
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast b/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast
index 28146f44e..02339d035 100644
--- a/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast
+++ b/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..33
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -28,7 +28,7 @@ [email protected]
         [email protected]
           [email protected] ","
       [email protected] " "
-      STRUCT_DEF@19..26
+      [email protected]
         [email protected] "struct"
         [email protected]
           [email protected] ","
@@ -40,7 +40,7 @@ [email protected]
       [email protected] " "
       [email protected] "}"
   [email protected] "\n"
-  FN_DEF@34..68
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -88,7 +88,7 @@ [email protected]
       [email protected] " "
       [email protected] "}"
   [email protected] "\n"
-  FN_DEF@69..111
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rast b/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rast
index 9ea9d715e..5ffefd742 100644
--- a/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rast
+++ b/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..55
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast b/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast
index 48610a5eb..4c2d1ad68 100644
--- a/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast
+++ b/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast
@@ -1,10 +1,10 @@
 [email protected]
-  FN_DEF@0..53
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
       [email protected] "f"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected]
@@ -39,7 +39,7 @@ [email protected]
             [email protected] "("
             [email protected]
               [email protected] "for"
-              TYP[email protected]
+              GENERIC[email protected]
                 [email protected] "<"
                 [email protected]
                   [email protected] "\'a"
@@ -65,7 +65,7 @@ [email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@55..239
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -122,7 +122,7 @@ [email protected]
               [email protected] "("
               [email protected]
                 [email protected] "for"
-                TYP[email protected]
+                GENERIC[email protected]
                   [email protected] "<"
                   [email protected]
                     [email protected] "\'a"
@@ -242,7 +242,7 @@ [email protected]
                           [email protected] "("
                           [email protected]
                             [email protected] "for"
-                            TYP[email protected]
+                            GENERIC[email protected]
                               [email protected] "<"
                               [email protected]
                                 [email protected] "\'a"
diff --git a/crates/ra_syntax/test_data/parser/err/0025_nope.rast b/crates/ra_syntax/test_data/parser/err/0025_nope.rast
index 88b086daf..fca646557 100644
--- a/crates/ra_syntax/test_data/parser/err/0025_nope.rast
+++ b/crates/ra_syntax/test_data/parser/err/0025_nope.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..574
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -11,26 +11,26 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      ENUM_DEF@16..152
+      [email protected]
         [email protected] "enum"
         [email protected] " "
         [email protected]
           [email protected] "Test"
         [email protected] " "
-        ENUM_[email protected]
+        [email protected]
           [email protected] "{"
           [email protected] "\n        "
-          ENUM_[email protected]
+          [email protected]
             [email protected]
               [email protected] "Var1"
           [email protected] ","
           [email protected] "\n        "
-          ENUM_[email protected]
+          [email protected]
             [email protected]
               [email protected] "Var2"
-            TUPLE_FIELD_DEF_[email protected]
+            [email protected]
               [email protected] "("
-              TUPLE_FIELD_DEF@55..61
+              [email protected]
                 [email protected]
                   [email protected]
                     [email protected]
@@ -39,14 +39,14 @@ [email protected]
               [email protected] ")"
           [email protected] ","
           [email protected] "\n        "
-          ENUM_[email protected]
+          [email protected]
             [email protected]
               [email protected] "Var3"
             [email protected] " "
-            RECORD_FIELD_DEF_[email protected]
+            [email protected]
               [email protected] "{"
               [email protected] "\n            "
-              RECORD_FIELD_DEF@91..95
+              [email protected]
                 [email protected]
                   [email protected] "abc"
                 [email protected] ":"
@@ -79,39 +79,39 @@ [email protected]
           [email protected] "1"
         [email protected] ";"
       [email protected] "\n    "
-      ENUM_DEF@191..223
+      [email protected]
         [email protected] "enum"
         [email protected] " "
         [email protected]
           [email protected] "Test2"
         [email protected] " "
-        ENUM_[email protected]
+        [email protected]
           [email protected] "{"
           [email protected] "\n        "
-          ENUM_[email protected]
+          [email protected]
             [email protected]
               [email protected] "Fine"
           [email protected] ","
           [email protected] "\n    "
           [email protected] "}"
       [email protected] "\n\n    "
-      ENUM_DEF@229..300
+      [email protected]
         [email protected] "enum"
         [email protected] " "
         [email protected]
           [email protected] "Test3"
         [email protected] " "
-        ENUM_[email protected]
+        [email protected]
           [email protected] "{"
           [email protected] "\n        "
-          ENUM_[email protected]
+          [email protected]
             [email protected]
               [email protected] "StillFine"
             [email protected] " "
-            RECORD_FIELD_DEF_[email protected]
+            [email protected]
               [email protected] "{"
               [email protected] "\n            "
-              RECORD_FIELD_DEF@274..282
+              [email protected]
                 [email protected]
                   [email protected] "def"
                 [email protected] ":"
@@ -132,7 +132,7 @@ [email protected]
         [email protected]
           [email protected] "{"
           [email protected] "\n        "
-          ENUM_DEF@316..453
+          [email protected]
             [email protected] "// fail again"
             [email protected] "\n        "
             [email protected] "enum"
@@ -140,15 +140,15 @@ [email protected]
             [email protected]
               [email protected] "Test4"
             [email protected] " "
-            ENUM_[email protected]
+            [email protected]
               [email protected] "{"
               [email protected] "\n            "
-              ENUM_[email protected]
+              [email protected]
                 [email protected]
                   [email protected] "Nope"
-                TUPLE_FIELD_DEF_[email protected]
+                [email protected]
                   [email protected] "("
-                  TUPLE_FIELD_DEF@368..371
+                  [email protected]
                     [email protected]
                       [email protected]
                         [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rast b/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rast
index 254ff546a..8c8bf7b7e 100644
--- a/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rast
+++ b/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rast
@@ -1,7 +1,7 @@
 [email protected]
   [email protected]
     [email protected] "impl"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected]
@@ -19,7 +19,7 @@ [email protected]
   [email protected] "\n"
   [email protected]
     [email protected] "impl"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.rast b/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.rast
index 4d6461d1e..a8e42e6ea 100644
--- a/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.rast
+++ b/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..29
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -13,7 +13,7 @@ [email protected]
       [email protected] " "
       [email protected]
         [email protected] "for"
-        TYP[email protected]
+        GENERIC[email protected]
           [email protected] "<"
           [email protected]
             [email protected] "\'a"
diff --git a/crates/ra_syntax/test_data/parser/err/0029_field_completion.rast b/crates/ra_syntax/test_data/parser/err/0029_field_completion.rast
index 0da8f59f0..bfcd0149e 100644
--- a/crates/ra_syntax/test_data/parser/err/0029_field_completion.rast
+++ b/crates/ra_syntax/test_data/parser/err/0029_field_completion.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..23
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rast b/crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rast
index 515819e42..55ff3943f 100644
--- a/crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rast
+++ b/crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..349
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast b/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast
index c6859eca8..ec9f556aa 100644
--- a/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast
+++ b/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..292
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast b/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast
index 53e445459..063532e02 100644
--- a/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast
+++ b/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..88
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rast b/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rast
index 1b2ac5011..303a49576 100644
--- a/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rast
+++ b/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..89
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0035_use_recover.rast b/crates/ra_syntax/test_data/parser/err/0035_use_recover.rast
index 0415085b0..2f03709eb 100644
--- a/crates/ra_syntax/test_data/parser/err/0035_use_recover.rast
+++ b/crates/ra_syntax/test_data/parser/err/0035_use_recover.rast
@@ -34,7 +34,7 @@ [email protected]
   [email protected]
     [email protected] "use"
   [email protected] "\n"
-  FN_DEF@38..47
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast b/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast
index bc446e3df..b1400aa5f 100644
--- a/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast
+++ b/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast
@@ -17,7 +17,7 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      FN_DEF@20..31
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -30,7 +30,7 @@ [email protected]
           [email protected] "{"
           [email protected] "}"
       [email protected] "\n    "
-      FN_DEF@36..51
+      [email protected]
         [email protected]
           [email protected] "pub"
         [email protected] " "
@@ -46,7 +46,7 @@ [email protected]
           [email protected] "{"
           [email protected] "}"
       [email protected] "\n    "
-      TYPE_ALIAS_DEF@56..81
+      [email protected]
         [email protected]
           [email protected] "pub"
           [email protected] "("
@@ -65,7 +65,7 @@ [email protected]
           [email protected] ")"
         [email protected] ";"
       [email protected] "\n    "
-      CONST_DEF@86..115
+      [email protected]
         [email protected]
           [email protected] "pub"
           [email protected] "("
diff --git a/crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rast b/crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rast
index 21db9ee85..bed7ad6c3 100644
--- a/crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rast
+++ b/crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..32
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast b/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast
index ec950381b..a98c31b0c 100644
--- a/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast
+++ b/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..82
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0043_default_const.rast b/crates/ra_syntax/test_data/parser/err/0043_default_const.rast
index 6ca1a4870..f041fa6f7 100644
--- a/crates/ra_syntax/test_data/parser/err/0043_default_const.rast
+++ b/crates/ra_syntax/test_data/parser/err/0043_default_const.rast
@@ -14,7 +14,7 @@ [email protected]
             [email protected]
               [email protected] "default"
       [email protected] " "
-      CONST_DEF@20..36
+      [email protected]
         [email protected] "const"
         [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 cb90f28bc..082625c13 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
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..30
+  [email protected]
     [email protected] "type"
     [email protected] " "
     [email protected]
@@ -9,7 +9,7 @@ [email protected]
     [email protected] " "
     [email protected]
       [email protected] "for"
-      TYP[email protected]
+      GENERIC[email protected]
         [email protected] "<"
         [email protected]
           [email protected] "\'a"
@@ -26,7 +26,7 @@ [email protected]
                 [email protected] "u32"
     [email protected] ";"
   [email protected] "\n"
-  TYPE_ALIAS_DEF@31..64
+  [email protected]
     [email protected] "type"
     [email protected] " "
     [email protected]
@@ -36,7 +36,7 @@ [email protected]
     [email protected] " "
     [email protected]
       [email protected] "for"
-      TYP[email protected]
+      GENERIC[email protected]
         [email protected] "<"
         [email protected]
           [email protected] "\'a"
@@ -57,7 +57,7 @@ [email protected]
         [email protected] ")"
     [email protected] ";"
   [email protected] "\n"
-  TYPE_ALIAS_DEF@65..95
+  [email protected]
     [email protected] "type"
     [email protected] " "
     [email protected]
@@ -67,7 +67,7 @@ [email protected]
     [email protected] " "
     [email protected]
       [email protected] "for"
-      TYP[email protected]
+      GENERIC[email protected]
         [email protected] "<"
         [email protected]
           [email protected] "\'a"
@@ -83,7 +83,7 @@ [email protected]
         [email protected] "]"
     [email protected] ";"
   [email protected] "\n"
-  TYPE_ALIAS_DEF@96..149
+  [email protected]
     [email protected] "type"
     [email protected] " "
     [email protected]
@@ -93,7 +93,7 @@ [email protected]
     [email protected] " "
     [email protected]
       [email protected] "for"
-      TYP[email protected]
+      GENERIC[email protected]
         [email protected] "<"
         [email protected]
           [email protected] "\'a"
@@ -101,7 +101,7 @@ [email protected]
       [email protected] " "
       [email protected]
         [email protected] "for"
-        TYP[email protected]
+        GENERIC[email protected]
           [email protected] "<"
           [email protected]
             [email protected] "\'b"
@@ -136,12 +136,12 @@ [email protected]
             [email protected] ")"
     [email protected] ";"
   [email protected] "\n"
-  FN_DEF@150..238
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
       [email protected] "for_for_for"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected]
@@ -156,7 +156,7 @@ [email protected]
       [email protected] "\n    "
       [email protected]
         [email protected] "for"
-        TYP[email protected]
+        GENERIC[email protected]
           [email protected] "<"
           [email protected]
             [email protected] "\'a"
@@ -164,7 +164,7 @@ [email protected]
         [email protected] " "
         [email protected]
           [email protected] "for"
-          TYP[email protected]
+          GENERIC[email protected]
             [email protected] "<"
             [email protected]
               [email protected] "\'b"
@@ -172,7 +172,7 @@ [email protected]
           [email protected] " "
           [email protected]
             [email protected] "for"
-            TYP[email protected]
+            GENERIC[email protected]
               [email protected] "<"
               [email protected]
                 [email protected] "\'c"
diff --git a/crates/ra_syntax/test_data/parser/err/0163_weird_blocks.rast b/crates/ra_syntax/test_data/parser/err/0163_weird_blocks.rast
index e46456384..df29017e7 100644
--- a/crates/ra_syntax/test_data/parser/err/0163_weird_blocks.rast
+++ b/crates/ra_syntax/test_data/parser/err/0163_weird_blocks.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..82
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/fragments/item/ok/0000_fn.rast b/crates/ra_syntax/test_data/parser/fragments/item/ok/0000_fn.rast
index f1e78f388..93c429e12 100644
--- a/crates/ra_syntax/test_data/parser/fragments/item/ok/0000_fn.rast
+++ b/crates/ra_syntax/test_data/parser/fragments/item/ok/0000_fn.rast
@@ -1,4 +1,4 @@
-FN_DEF@0..11
+[email protected]
   [email protected] "fn"
   [email protected] " "
   [email protected]
diff --git a/crates/ra_syntax/test_data/parser/fuzz-failures/0000.rs b/crates/ra_syntax/test_data/parser/fuzz-failures/0000.rs
index 0e6e0ccc3..f1d0dc343 100644
--- a/crates/ra_syntax/test_data/parser/fuzz-failures/0000.rs
+++ b/crates/ra_syntax/test_data/parser/fuzz-failures/0000.rs
@@ -86,7 +86,7 @@ fn find_reparsable_node(node: SyntaxNodeRef, range: TextRange) -> Option<(Syntax
     fn reparser(node: SyntaxNodeRef) -> Option<fn(&mut Parser)> {
         let res = match node.kind() {
             BLOCK => grammar::block,
-            RECORD_FIELD_DEF_LIST => grammar::record_field_def_list,
+            RECORD_FIELD_LIST => grammar::record_field_list,
             _ => return None,
         };
         Some(res)
@@ -138,7 +138,7 @@ fn find_reparsable_node(node: SyntaxNodeRef, range: TextRange) -> Option<(Syntax
         let res = match node.kind() {
      ;
     let end = u32::from(range.end()) as usize;
-    text.replaT => grammar::record_field_def_list,
+    text.replaT => grammar::record_field_list,
             _ => return None,
         };
         Some(res)
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0001_array_type_missing_semi.rast b/crates/ra_syntax/test_data/parser/inline/err/0001_array_type_missing_semi.rast
index bf70ebca4..0b9bbec07 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0001_array_type_missing_semi.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0001_array_type_missing_semi.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..12
+  [email protected]
     [email protected] "type"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast b/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast
index 75668c818..8b0a888fd 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..29
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [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 95bcc3c0a..2409eefe7 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
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..13
+  [email protected]
     [email protected] "type"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0005_fn_pointer_type_missing_fn.rast b/crates/ra_syntax/test_data/parser/inline/err/0005_fn_pointer_type_missing_fn.rast
index 90202d764..776022fd9 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0005_fn_pointer_type_missing_fn.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0005_fn_pointer_type_missing_fn.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..15
+  [email protected]
     [email protected] "type"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rast b/crates/ra_syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rast
index c789e8d82..cc0f8bcaf 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..10
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -19,7 +19,7 @@ [email protected]
     [email protected] " "
     [email protected] "}"
   [email protected] " "
-  FN_DEF@22..32
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rast b/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rast
index cd24313d4..3f3a7f1b9 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..29
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.rast b/crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.rast
index c5fa7a404..63a10127d 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..20
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast b/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast
index 4e3fa704e..8fd8d5e59 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..47
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rast b/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rast
index e1abc5633..fa14e1e6d 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..46
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast b/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast
index 53f7ebaf9..a6e6552a9 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast
@@ -2,7 +2,7 @@ [email protected]
   [email protected]
     [email protected] "unsafe"
   [email protected] " "
-  FN_DEF@7..24
+  [email protected]
     [email protected] "async"
     [email protected] " "
     [email protected] "fn"
@@ -17,7 +17,7 @@ [email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n"
-  CONST_DEF@25..46
+  [email protected]
     [email protected] "unsafe"
     [email protected] " "
     [email protected] "const"
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0013_static_underscore.rast b/crates/ra_syntax/test_data/parser/inline/err/0013_static_underscore.rast
index ebcc26e0d..8d761b907 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0013_static_underscore.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0013_static_underscore.rast
@@ -1,5 +1,5 @@
 [email protected]
-  STATIC_DEF@0..18
+  [email protected]
     [email protected] "static"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast b/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast
index 5501dc5a6..22c7c5f0d 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast
@@ -14,7 +14,7 @@ [email protected]
             [email protected]
               [email protected] "default"
       [email protected] " "
-      TYPE_ALIAS_DEF@22..35
+      [email protected]
         [email protected] "type"
         [email protected] " "
         [email protected]
@@ -35,7 +35,7 @@ [email protected]
             [email protected]
               [email protected] "default"
       [email protected] " "
-      FN_DEF@48..59
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rast b/crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rast
index a9de44b57..a81c442c0 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..44
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -11,16 +11,16 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      RECORD_LIT@16..42
+      RECORD_EXPR@16..42
         [email protected]
           [email protected]
             [email protected]
               [email protected] "S"
         [email protected] " "
-        [email protected]
+        RECORD_EXPR_[email protected]
           [email protected] "{"
           [email protected] " "
-          [email protected]
+          RECORD_EXPR_[email protected]
             [email protected]
               [email protected] "field"
             [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.rast b/crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.rast
index f422acdda..955e00dde 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.rast
@@ -11,7 +11,7 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      TYPE_ALIAS_DEF@13..27
+      [email protected]
         [email protected] "type"
         [email protected] " "
         [email protected]
@@ -27,7 +27,7 @@ [email protected]
                     [email protected] "Clone"
         [email protected] ";"
       [email protected] "\n    "
-      CONST_DEF@32..45
+      [email protected]
         [email protected] "const"
         [email protected] " "
         [email protected]
@@ -41,7 +41,7 @@ [email protected]
                 [email protected] "i32"
         [email protected] ";"
       [email protected] "\n    "
-      FN_DEF@50..61
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -54,7 +54,7 @@ [email protected]
           [email protected] "{"
           [email protected] "}"
       [email protected] "\n    "
-      FN_DEF@66..80
+      [email protected]
         [email protected] "fn"
         [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 cd0892451..b0f2b5888 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
@@ -1,10 +1,10 @@
 [email protected]
-  FN_DEF@0..53
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
       [email protected] "for_trait"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected]
@@ -19,7 +19,7 @@ [email protected]
       [email protected] "\n   "
       [email protected]
         [email protected] "for"
-        TYP[email protected]
+        GENERIC[email protected]
           [email protected] "<"
           [email protected]
             [email protected] "\'a"
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 20eba09f5..ace8ad050 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
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..38
+  [email protected]
     [email protected] "type"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0005_function_type_params.rast b/crates/ra_syntax/test_data/parser/inline/ok/0005_function_type_params.rast
index 6c8c1e24b..8e0252ce7 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0005_function_type_params.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0005_function_type_params.rast
@@ -1,10 +1,10 @@
 [email protected]
-  FN_DEF@0..27
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
       [email protected] "foo"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast b/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast
index 0cd1dffc9..87c170707 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast
@@ -11,7 +11,7 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      FN_DEF@13..26
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -26,7 +26,7 @@ [email protected]
           [email protected] "{"
           [email protected] "}"
       [email protected] "\n    "
-      FN_DEF@31..46
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -43,7 +43,7 @@ [email protected]
           [email protected] "{"
           [email protected] "}"
       [email protected] "\n    "
-      FN_DEF@51..69
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -62,7 +62,7 @@ [email protected]
           [email protected] "{"
           [email protected] "}"
       [email protected] "\n    "
-      FN_DEF@74..103
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -95,7 +95,7 @@ [email protected]
           [email protected] "{"
           [email protected] "}"
       [email protected] "\n    "
-      FN_DEF@108..125
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0007_type_param_bounds.rast b/crates/ra_syntax/test_data/parser/inline/ok/0007_type_param_bounds.rast
index 7cb9e1d55..e95688f56 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0007_type_param_bounds.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0007_type_param_bounds.rast
@@ -1,10 +1,10 @@
 [email protected]
-  STRUCT_DEF@0..34
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "S"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.rast b/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.rast
index 10eb31d68..3ce2acfae 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..102
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0009_loop_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0009_loop_expr.rast
index 425e5196c..f62826fd5 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0009_loop_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0009_loop_expr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..25
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0011_field_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0011_field_expr.rast
index d823c08fc..66a609346 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0011_field_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0011_field_expr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..47
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0012_type_item_where_clause.rast b/crates/ra_syntax/test_data/parser/inline/ok/0012_type_item_where_clause.rast
index 283442a8b..28c94bfd6 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0012_type_item_where_clause.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0012_type_item_where_clause.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..30
+  [email protected]
     [email protected] "type"
     [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 e2e871dda..845b32e6d 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
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..17
+  [email protected]
     [email protected] "type"
     [email protected] " "
     [email protected]
@@ -16,7 +16,7 @@ [email protected]
         [email protected] ")"
     [email protected] ";"
   [email protected] "\n"
-  TYPE_ALIAS_DEF@18..35
+  [email protected]
     [email protected] "type"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0014_never_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0014_never_type.rast
index a60940fcf..b1d5106ce 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0014_never_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0014_never_type.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..15
+  [email protected]
     [email protected] "type"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0015_continue_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0015_continue_expr.rast
index 422912e3c..104e153ce 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0015_continue_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0015_continue_expr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..68
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0017_array_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0017_array_type.rast
index 61a0b22f4..c131df1c9 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0017_array_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0017_array_type.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..18
+  [email protected]
     [email protected] "type"
     [email protected] " "
     [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 79148e953..e75180900 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
@@ -11,7 +11,7 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      FN_DEF@13..33
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -35,7 +35,7 @@ [email protected]
           [email protected] "{"
           [email protected] "}"
       [email protected] "\n    "
-      FN_DEF@38..66
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0019_unary_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0019_unary_expr.rast
index 10d6b2fde..7db38ea4d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0019_unary_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0019_unary_expr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..43
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.rast b/crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.rast
index 31b5b6616..52181ca0c 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.rast
@@ -11,7 +11,7 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      TYPE_ALIAS_DEF@13..26
+      [email protected]
         [email protected] "type"
         [email protected] " "
         [email protected]
@@ -26,7 +26,7 @@ [email protected]
                 [email protected] "i32"
         [email protected] ";"
       [email protected] "\n    "
-      CONST_DEF@31..49
+      [email protected]
         [email protected] "const"
         [email protected] " "
         [email protected]
@@ -45,7 +45,7 @@ [email protected]
           [email protected] "92"
         [email protected] ";"
       [email protected] "\n    "
-      FN_DEF@54..65
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -58,7 +58,7 @@ [email protected]
           [email protected] "{"
           [email protected] "}"
       [email protected] "\n    "
-      FN_DEF@70..86
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0022_crate_visibility.rast b/crates/ra_syntax/test_data/parser/inline/ok/0022_crate_visibility.rast
index 1b810607e..50742cbcf 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0022_crate_visibility.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0022_crate_visibility.rast
@@ -1,5 +1,5 @@
 [email protected]
-  STRUCT_DEF@0..20
+  [email protected]
     [email protected]
       [email protected] "pub"
       [email protected] "("
@@ -12,7 +12,7 @@ [email protected]
       [email protected] "S"
     [email protected] ";"
   [email protected] "\n"
-  STRUCT_DEF@21..40
+  [email protected]
     [email protected]
       [email protected] "pub"
       [email protected] "("
@@ -25,7 +25,7 @@ [email protected]
       [email protected] "S"
     [email protected] ";"
   [email protected] "\n"
-  STRUCT_DEF@41..60
+  [email protected]
     [email protected]
       [email protected] "pub"
       [email protected] "("
@@ -38,7 +38,7 @@ [email protected]
       [email protected] "S"
     [email protected] ";"
   [email protected] "\n"
-  STRUCT_DEF@61..80
+  [email protected]
     [email protected]
       [email protected] "pub"
       [email protected] "("
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0023_placeholder_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0023_placeholder_type.rast
index 17687617b..57008e5fe 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0023_placeholder_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0023_placeholder_type.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..21
+  [email protected]
     [email protected] "type"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.rast
index 7eb27d5e1..dea0c73f7 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..38
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0025_slice_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0025_slice_type.rast
index 0a6d77f45..fd819ea37 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0025_slice_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0025_slice_type.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..14
+  [email protected]
     [email protected] "type"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rast b/crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rast
index b4598768e..e5f550347 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..96
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0027_ref_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0027_ref_pat.rast
index b824c10a8..9e76d881e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0027_ref_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0027_ref_pat.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..51
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0028_impl_trait_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0028_impl_trait_type.rast
index 93f5c738c..f45f3cab8 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0028_impl_trait_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0028_impl_trait_type.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..42
+  [email protected]
     [email protected] "type"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0029_cast_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0029_cast_expr.rast
index fabb09937..e096b3a1f 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0029_cast_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0029_cast_expr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..88
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0030_cond.rast b/crates/ra_syntax/test_data/parser/inline/ok/0030_cond.rast
index 3aed26732..381284dc5 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0030_cond.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0030_cond.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..37
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -41,7 +41,7 @@ [email protected]
       [email protected] " "
       [email protected] "}"
   [email protected] "\n"
-  FN_DEF@38..196
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0031_while_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0031_while_expr.rast
index 899b63aac..ffe1a3a01 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0031_while_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0031_while_expr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..92
+  [email protected]
     [email protected] "fn"
     [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 72705e148..79a5ee339 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
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..14
+  [email protected]
     [email protected] "type"
     [email protected] " "
     [email protected]
@@ -14,7 +14,7 @@ [email protected]
         [email protected] ")"
     [email protected] ";"
   [email protected] "\n"
-  TYPE_ALIAS_DEF@15..36
+  [email protected]
     [email protected] "type"
     [email protected] " "
     [email protected]
@@ -31,7 +31,7 @@ [email protected]
         [email protected] ")"
     [email protected] ";"
   [email protected] "\n"
-  TYPE_ALIAS_DEF@37..69
+  [email protected]
     [email protected] "type"
     [email protected] " "
     [email protected]
@@ -53,7 +53,7 @@ [email protected]
         [email protected] ")"
     [email protected] ";"
   [email protected] "\n"
-  TYPE_ALIAS_DEF@70..112
+  [email protected]
     [email protected] "type"
     [email protected] " "
     [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 784fbb592..c522f76cf 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
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..13
+  [email protected]
     [email protected] "type"
     [email protected] " "
     [email protected]
@@ -14,7 +14,7 @@ [email protected]
         [email protected] ")"
     [email protected] ";"
   [email protected] "\n"
-  TYPE_ALIAS_DEF@14..35
+  [email protected]
     [email protected] "type"
     [email protected] " "
     [email protected]
@@ -31,7 +31,7 @@ [email protected]
         [email protected] ")"
     [email protected] ";"
   [email protected] "\n"
-  TYPE_ALIAS_DEF@36..53
+  [email protected]
     [email protected] "type"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0034_break_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0034_break_expr.rast
index e064aafaf..f905def6f 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0034_break_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0034_break_expr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..101
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0036_unsafe_extern_fn.rast b/crates/ra_syntax/test_data/parser/inline/ok/0036_unsafe_extern_fn.rast
index cf5825593..293b1d64c 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0036_unsafe_extern_fn.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0036_unsafe_extern_fn.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..29
+  [email protected]
     [email protected] "unsafe"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0037_qual_paths.rast b/crates/ra_syntax/test_data/parser/inline/ok/0037_qual_paths.rast
index fbd90bc0f..b6379e62f 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0037_qual_paths.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0037_qual_paths.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..26
+  [email protected]
     [email protected] "type"
     [email protected] " "
     [email protected]
@@ -32,7 +32,7 @@ [email protected]
             [email protected] "Output"
     [email protected] ";"
   [email protected] "\n"
-  FN_DEF@27..70
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0038_full_range_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0038_full_range_expr.rast
index a767f145d..64e705fb3 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0038_full_range_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0038_full_range_expr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..20
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast b/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast
index e92ea2bf2..2185d3c91 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..45
+  [email protected]
     [email protected] "type"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rast b/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rast
index aa582516a..db5bd2849 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..19
+  [email protected]
     [email protected]
       [email protected] "crate"
     [email protected] " "
@@ -16,16 +16,16 @@ [email protected]
       [email protected] " "
       [email protected] "}"
   [email protected] "\n"
-  STRUCT_DEF@20..49
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "S"
     [email protected] " "
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "{"
       [email protected] " "
-      RECORD_FIELD_DEF@31..47
+      [email protected]
         [email protected]
           [email protected] "crate"
         [email protected] " "
@@ -41,14 +41,14 @@ [email protected]
       [email protected] " "
       [email protected] "}"
   [email protected] "\n"
-  STRUCT_DEF@50..70
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "T"
-    TUPLE_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "("
-      TUPLE_FIELD_DEF@59..68
+      [email protected]
         [email protected]
           [email protected] "crate"
         [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0041_trait_item.rast b/crates/ra_syntax/test_data/parser/inline/ok/0041_trait_item.rast
index 884ab2dbf..8f20ccaa3 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0041_trait_item.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0041_trait_item.rast
@@ -4,7 +4,7 @@ [email protected]
     [email protected] " "
     [email protected]
       [email protected] "T"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected]
@@ -57,7 +57,7 @@ [email protected]
     [email protected] " "
     [email protected]
       [email protected] "X"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0042_call_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0042_call_expr.rast
index 0c1c6e877..40875ae1e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0042_call_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0042_call_expr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..117
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0044_block_items.rast b/crates/ra_syntax/test_data/parser/inline/ok/0044_block_items.rast
index c23b3b67c..1fd3cd0e7 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0044_block_items.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0044_block_items.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..20
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -11,7 +11,7 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] " "
-      FN_DEF@9..18
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [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 9ca2165ba..d4235a8b1 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
@@ -1,10 +1,10 @@
 [email protected]
-  FN_DEF@0..34
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
       [email protected] "foo"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0046_singleton_tuple_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0046_singleton_tuple_type.rast
index c28dc9d61..e89284c14 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0046_singleton_tuple_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0046_singleton_tuple_type.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..16
+  [email protected]
     [email protected] "type"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast b/crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast
index b209f67f8..37757ccd4 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..26
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -38,7 +38,7 @@ [email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n"
-  FN_DEF@27..57
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0050_fn_decl.rast b/crates/ra_syntax/test_data/parser/inline/ok/0050_fn_decl.rast
index 5f1429102..02c57079f 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0050_fn_decl.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0050_fn_decl.rast
@@ -8,7 +8,7 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] " "
-      FN_DEF@10..19
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0051_unit_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0051_unit_type.rast
index 798ef2a48..6330dbf9e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0051_unit_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0051_unit_type.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..12
+  [email protected]
     [email protected] "type"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0052_path_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0052_path_type.rast
index 0d2f5ff56..9bc36bea7 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0052_path_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0052_path_type.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..13
+  [email protected]
     [email protected] "type"
     [email protected] " "
     [email protected]
@@ -14,7 +14,7 @@ [email protected]
             [email protected] "Foo"
     [email protected] ";"
   [email protected] "\n"
-  TYPE_ALIAS_DEF@14..29
+  [email protected]
     [email protected] "type"
     [email protected] " "
     [email protected]
@@ -30,7 +30,7 @@ [email protected]
             [email protected] "Foo"
     [email protected] ";"
   [email protected] "\n"
-  TYPE_ALIAS_DEF@30..49
+  [email protected]
     [email protected] "type"
     [email protected] " "
     [email protected]
@@ -49,7 +49,7 @@ [email protected]
             [email protected] "Foo"
     [email protected] ";"
   [email protected] "\n"
-  TYPE_ALIAS_DEF@50..70
+  [email protected]
     [email protected] "type"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast
index 70232a3b2..2bfb52453 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..90
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0054_record_field_attrs.rast b/crates/ra_syntax/test_data/parser/inline/ok/0054_record_field_attrs.rast
index 6362aa02d..9ae271817 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0054_record_field_attrs.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0054_record_field_attrs.rast
@@ -1,14 +1,14 @@
 [email protected]
-  STRUCT_DEF@0..63
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "S"
     [email protected] " "
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      RECORD_FIELD_DEF@15..60
+      [email protected]
         [email protected]
           [email protected] "#"
           [email protected] "["
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0055_literal_pattern.rast b/crates/ra_syntax/test_data/parser/inline/ok/0055_literal_pattern.rast
index 03c52525e..68bb43852 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0055_literal_pattern.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0055_literal_pattern.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..112
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0056_where_clause.rast b/crates/ra_syntax/test_data/parser/inline/ok/0056_where_clause.rast
index 24f89b83f..28129c50c 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0056_where_clause.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0056_where_clause.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..115
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0057_const_fn.rast b/crates/ra_syntax/test_data/parser/inline/ok/0057_const_fn.rast
index bb43d1eaf..97548a5ee 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0057_const_fn.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0057_const_fn.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..17
+  [email protected]
     [email protected] "const"
     [email protected] " "
     [email protected] "fn"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0058_range_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0058_range_pat.rast
index 8bd94a868..3e72f9671 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0058_range_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0058_range_pat.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..111
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0059_match_arms_commas.rast b/crates/ra_syntax/test_data/parser/inline/ok/0059_match_arms_commas.rast
index 9210f155c..fa659c19b 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0059_match_arms_commas.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0059_match_arms_commas.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..82
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0061_record_lit.rast b/crates/ra_syntax/test_data/parser/inline/ok/0061_record_lit.rast
index 850465d82..a9ae1aa59 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0061_record_lit.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0061_record_lit.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..111
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -12,28 +12,28 @@ [email protected]
       [email protected] "{"
       [email protected] "\n    "
       [email protected]
-        RECORD_LIT@15..19
+        RECORD_EXPR@15..19
           [email protected]
             [email protected]
               [email protected]
                 [email protected] "S"
           [email protected] " "
-          [email protected]
+          RECORD_EXPR_[email protected]
             [email protected] "{"
             [email protected] "}"
         [email protected] ";"
       [email protected] "\n    "
       [email protected]
-        RECORD_LIT@25..40
+        RECORD_EXPR@25..40
           [email protected]
             [email protected]
               [email protected]
                 [email protected] "S"
           [email protected] " "
-          [email protected]
+          RECORD_EXPR_[email protected]
             [email protected] "{"
             [email protected] " "
-            [email protected]
+            RECORD_EXPR_[email protected]
               [email protected]
                 [email protected]
                   [email protected]
@@ -41,7 +41,7 @@ [email protected]
                       [email protected] "x"
             [email protected] ","
             [email protected] " "
-            [email protected]
+            RECORD_EXPR_[email protected]
               [email protected]
                 [email protected] "y"
               [email protected] ":"
@@ -54,16 +54,16 @@ [email protected]
         [email protected] ";"
       [email protected] "\n    "
       [email protected]
-        RECORD_LIT@46..82
+        RECORD_EXPR@46..82
           [email protected]
             [email protected]
               [email protected]
                 [email protected] "S"
           [email protected] " "
-          [email protected]
+          RECORD_EXPR_[email protected]
             [email protected] "{"
             [email protected] " "
-            [email protected]
+            RECORD_EXPR_[email protected]
               [email protected]
                 [email protected]
                   [email protected]
@@ -71,7 +71,7 @@ [email protected]
                       [email protected] "x"
             [email protected] ","
             [email protected] " "
-            [email protected]
+            RECORD_EXPR_[email protected]
               [email protected]
                 [email protected] "y"
               [email protected] ":"
@@ -100,16 +100,16 @@ [email protected]
         [email protected] ";"
       [email protected] "\n    "
       [email protected]
-        RECORD_LIT@88..108
+        RECORD_EXPR@88..108
           [email protected]
             [email protected]
               [email protected]
                 [email protected] "TupleStruct"
           [email protected] " "
-          [email protected]
+          RECORD_EXPR_[email protected]
             [email protected] "{"
             [email protected] " "
-            [email protected]
+            RECORD_EXPR_[email protected]
               [email protected]
                 [email protected] "0"
               [email protected] ":"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0062_mod_contents.rast b/crates/ra_syntax/test_data/parser/inline/ok/0062_mod_contents.rast
index 02656df31..de8217064 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0062_mod_contents.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0062_mod_contents.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..11
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -57,7 +57,7 @@ [email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n"
-  STRUCT_DEF@60..69
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.rast
index 445d8d309..587160003 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..136
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast
index 8e10f3673..629fea99d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..41
+  [email protected]
     [email protected] "type"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rast b/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rast
index 177bb5514..37ca478e6 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..166
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -49,14 +49,14 @@ [email protected]
                   [email protected] " "
                   [email protected] ">"
                   [email protected] " "
-                  RECORD_LIT@63..77
+                  RECORD_EXPR@63..77
                     [email protected]
                       [email protected]
                         [email protected]
                           [email protected] "Test"
-                    [email protected]
+                    RECORD_EXPR_[email protected]
                       [email protected] "{"
-                      [email protected]
+                      RECORD_EXPR_[email protected]
                         [email protected]
                           [email protected] "field"
                         [email protected] ":"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0068_union_items.rast b/crates/ra_syntax/test_data/parser/inline/ok/0068_union_items.rast
index ec2496072..6589e4795 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0068_union_items.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0068_union_items.rast
@@ -1,24 +1,24 @@
 [email protected]
-  UNION_DEF@0..12
+  [email protected]
     [email protected] "union"
     [email protected] " "
     [email protected]
       [email protected] "Foo"
     [email protected] " "
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n"
-  UNION_DEF@13..50
+  [email protected]
     [email protected] "union"
     [email protected] " "
     [email protected]
       [email protected] "Foo"
     [email protected] " "
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      RECORD_FIELD_DEF@29..35
+      [email protected]
         [email protected]
           [email protected] "a"
         [email protected] ":"
@@ -30,7 +30,7 @@ [email protected]
                 [email protected] "i32"
       [email protected] ","
       [email protected] "\n    "
-      RECORD_FIELD_DEF@41..47
+      [email protected]
         [email protected]
           [email protected] "b"
         [email protected] ":"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rast b/crates/ra_syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rast
index f8ff7079b..4c1165dc8 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..45
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.rast
index 07b3d1435..673d396ee 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..96
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -72,13 +72,13 @@ [email protected]
           [email protected]
             [email protected] "{"
             [email protected] " "
-            RECORD_LIT@84..88
+            RECORD_EXPR@84..88
               [email protected]
                 [email protected]
                   [email protected]
                     [email protected] "S"
               [email protected] " "
-              [email protected]
+              RECORD_EXPR_[email protected]
                 [email protected] "{"
                 [email protected] "}"
             [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0072_return_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0072_return_expr.rast
index 665f716a8..437d7ac04 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0072_return_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0072_return_expr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..39
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0073_type_item_type_params.rast b/crates/ra_syntax/test_data/parser/inline/ok/0073_type_item_type_params.rast
index cc871ac0c..00cce69e6 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0073_type_item_type_params.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0073_type_item_type_params.rast
@@ -1,10 +1,10 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..20
+  [email protected]
     [email protected] "type"
     [email protected] " "
     [email protected]
       [email protected] "Result"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rast b/crates/ra_syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rast
index 3fd3a4391..3ca70f021 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..83
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0075_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0075_block.rast
index 97c6e6a9d..5cefc5076 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0075_block.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0075_block.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..9
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -12,7 +12,7 @@ [email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n"
-  FN_DEF@10..31
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -38,7 +38,7 @@ [email protected]
       [email protected] " "
       [email protected] "}"
   [email protected] "\n"
-  FN_DEF@32..48
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -62,7 +62,7 @@ [email protected]
       [email protected] " "
       [email protected] "}"
   [email protected] "\n"
-  FN_DEF@49..64
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0076_function_where_clause.rast b/crates/ra_syntax/test_data/parser/inline/ok/0076_function_where_clause.rast
index e2c1a507d..96217a7fd 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0076_function_where_clause.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0076_function_where_clause.rast
@@ -1,10 +1,10 @@
 [email protected]
-  FN_DEF@0..28
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
       [email protected] "foo"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0077_try_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0077_try_expr.rast
index 4f3a8ed24..33e6fb93f 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0077_try_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0077_try_expr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..20
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0078_type_item.rast b/crates/ra_syntax/test_data/parser/inline/ok/0078_type_item.rast
index a08e16fab..2befc8388 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0078_type_item.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0078_type_item.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..15
+  [email protected]
     [email protected] "type"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0080_postfix_range.rast b/crates/ra_syntax/test_data/parser/inline/ok/0080_postfix_range.rast
index 462d1a8bb..3c80846db 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0080_postfix_range.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0080_postfix_range.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..88
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [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 b26ac2d36..e7629ac03 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
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..28
+  [email protected]
     [email protected] "type"
     [email protected] " "
     [email protected]
@@ -9,7 +9,7 @@ [email protected]
     [email protected] " "
     [email protected]
       [email protected] "for"
-      TYP[email protected]
+      GENERIC[email protected]
         [email protected] "<"
         [email protected]
           [email protected] "\'a"
@@ -29,7 +29,7 @@ [email protected]
             [email protected] ")"
     [email protected] ";"
   [email protected] "\n"
-  TYPE_ALIAS_DEF@29..81
+  [email protected]
     [email protected] "type"
     [email protected] " "
     [email protected]
@@ -39,7 +39,7 @@ [email protected]
     [email protected] " "
     [email protected]
       [email protected] "for"
-      TYP[email protected]
+      GENERIC[email protected]
         [email protected] "<"
         [email protected]
           [email protected] "\'a"
@@ -74,7 +74,7 @@ [email protected]
             [email protected] ")"
     [email protected] ";"
   [email protected] "\n"
-  TYPE_ALIAS_DEF@82..120
+  [email protected]
     [email protected] "type"
     [email protected] " "
     [email protected]
@@ -84,7 +84,7 @@ [email protected]
     [email protected] " "
     [email protected]
       [email protected] "for"
-      TYP[email protected]
+      GENERIC[email protected]
         [email protected] "<"
         [email protected]
           [email protected] "\'a"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0082_ref_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0082_ref_expr.rast
index 58bdf7e34..1563b1988 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0082_ref_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0082_ref_expr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..199
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0083_struct_items.rast b/crates/ra_syntax/test_data/parser/inline/ok/0083_struct_items.rast
index 217b07e59..cdbc40fe0 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0083_struct_items.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0083_struct_items.rast
@@ -1,39 +1,39 @@
 [email protected]
-  STRUCT_DEF@0..11
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "Foo"
     [email protected] ";"
   [email protected] "\n"
-  STRUCT_DEF@12..25
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "Foo"
     [email protected] " "
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n"
-  STRUCT_DEF@26..39
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "Foo"
-    TUPLE_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "("
       [email protected] ")"
     [email protected] ";"
   [email protected] "\n"
-  STRUCT_DEF@40..66
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "Foo"
-    TUPLE_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "("
-      TUPLE_FIELD_DEF@51..57
+      [email protected]
         [email protected]
           [email protected]
             [email protected]
@@ -41,7 +41,7 @@ [email protected]
                 [email protected] "String"
       [email protected] ","
       [email protected] " "
-      TUPLE_FIELD_DEF@59..64
+      [email protected]
         [email protected]
           [email protected]
             [email protected]
@@ -50,16 +50,16 @@ [email protected]
       [email protected] ")"
     [email protected] ";"
   [email protected] "\n"
-  STRUCT_DEF@67..105
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "Foo"
     [email protected] " "
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      RECORD_FIELD_DEF@84..90
+      [email protected]
         [email protected]
           [email protected] "a"
         [email protected] ":"
@@ -71,7 +71,7 @@ [email protected]
                 [email protected] "i32"
       [email protected] ","
       [email protected] "\n    "
-      RECORD_FIELD_DEF@96..102
+      [email protected]
         [email protected]
           [email protected] "b"
         [email protected] ":"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0084_paren_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0084_paren_type.rast
index 9cd8910d4..ee8894966 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0084_paren_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0084_paren_type.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..15
+  [email protected]
     [email protected] "type"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rast b/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rast
index 9fcb7899e..ded36949a 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..188
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0086_function_ret_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0086_function_ret_type.rast
index a42abc189..70e05a859 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0086_function_ret_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0086_function_ret_type.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..11
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -12,7 +12,7 @@ [email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n"
-  FN_DEF@12..29
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.rast b/crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.rast
index 7e71d7373..34f520994 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..87
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0089_extern_fn.rast b/crates/ra_syntax/test_data/parser/inline/ok/0089_extern_fn.rast
index 48aaf1004..405b6a259 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0089_extern_fn.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0089_extern_fn.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..18
+  [email protected]
     [email protected]
       [email protected] "extern"
     [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0090_type_param_default.rast b/crates/ra_syntax/test_data/parser/inline/ok/0090_type_param_default.rast
index cee2bc906..2ef026e37 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0090_type_param_default.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0090_type_param_default.rast
@@ -1,10 +1,10 @@
 [email protected]
-  STRUCT_DEF@0..18
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "S"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [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 1e2d7db7c..95686977f 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
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..20
+  [email protected]
     [email protected] "type"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0093_index_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0093_index_expr.rast
index aed81f9b0..82f03f9c1 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0093_index_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0093_index_expr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..25
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0095_placeholder_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0095_placeholder_pat.rast
index 67d9595d3..25706d2a4 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0095_placeholder_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0095_placeholder_pat.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..25
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rast
index 031e74652..cb5316a0d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..166
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0098_const_unsafe_fn.rast b/crates/ra_syntax/test_data/parser/inline/ok/0098_const_unsafe_fn.rast
index 816e49310..32a77ba49 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0098_const_unsafe_fn.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0098_const_unsafe_fn.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..24
+  [email protected]
     [email protected] "const"
     [email protected] " "
     [email protected] "unsafe"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0099_param_list.rast b/crates/ra_syntax/test_data/parser/inline/ok/0099_param_list.rast
index d48ef865c..1627556c8 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0099_param_list.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0099_param_list.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..9
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -12,7 +12,7 @@ [email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n"
-  FN_DEF@10..25
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -36,7 +36,7 @@ [email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n"
-  FN_DEF@26..43
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -62,7 +62,7 @@ [email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n"
-  FN_DEF@44..66
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.rast
index e4455cd3e..766de4efe 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..32
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0101_unsafe_fn.rast b/crates/ra_syntax/test_data/parser/inline/ok/0101_unsafe_fn.rast
index 8a8743060..73c94e5d4 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0101_unsafe_fn.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0101_unsafe_fn.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..18
+  [email protected]
     [email protected] "unsafe"
     [email protected] " "
     [email protected] "fn"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast b/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast
index 9f966ff8a..fe1c290c3 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..118
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0103_array_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0103_array_expr.rast
index 9b3bef04e..c4c0a0568 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0103_array_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0103_array_expr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..54
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0104_path_fn_trait_args.rast b/crates/ra_syntax/test_data/parser/inline/ok/0104_path_fn_trait_args.rast
index e3c4cfeb3..3f53d60c0 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0104_path_fn_trait_args.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0104_path_fn_trait_args.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..28
+  [email protected]
     [email protected] "type"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0106_lambda_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0106_lambda_expr.rast
index e64717152..51a6c5170 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0106_lambda_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0106_lambda_expr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..133
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rast
index 98963dc62..b2961b0ff 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..48
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0108_tuple_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0108_tuple_expr.rast
index ea603e2c9..ca7e4a5c3 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0108_tuple_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0108_tuple_expr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..39
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0109_label.rast b/crates/ra_syntax/test_data/parser/inline/ok/0109_label.rast
index 30ff96a7c..a6a169f1b 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0109_label.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0109_label.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..73
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0111_tuple_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0111_tuple_pat.rast
index b58f40ac1..432318da0 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0111_tuple_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0111_tuple_pat.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..93
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rast
index b67714c17..3cd554d45 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..145
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0113_nocontentexpr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0113_nocontentexpr.rast
index 5de480da9..d761c1c68 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0113_nocontentexpr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0113_nocontentexpr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..49
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0114_tuple_struct_where.rast b/crates/ra_syntax/test_data/parser/inline/ok/0114_tuple_struct_where.rast
index 01d717d6b..0e1594dc4 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0114_tuple_struct_where.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0114_tuple_struct_where.rast
@@ -1,18 +1,18 @@
 [email protected]
-  STRUCT_DEF@0..33
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "Test"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected]
           [email protected] "T"
       [email protected] ">"
-    TUPLE_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "("
-      TUPLE_FIELD_DEF@15..16
+      [email protected]
         [email protected]
           [email protected]
             [email protected]
@@ -40,20 +40,20 @@ [email protected]
                     [email protected] "Clone"
     [email protected] ";"
   [email protected] "\n"
-  STRUCT_DEF@34..52
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "Test"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected]
           [email protected] "T"
       [email protected] ">"
-    TUPLE_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "("
-      TUPLE_FIELD_DEF@49..50
+      [email protected]
         [email protected]
           [email protected]
             [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0115_tuple_field_attrs.rast b/crates/ra_syntax/test_data/parser/inline/ok/0115_tuple_field_attrs.rast
index 3c0ef9005..4d09c9f50 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0115_tuple_field_attrs.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0115_tuple_field_attrs.rast
@@ -1,14 +1,14 @@
 [email protected]
-  STRUCT_DEF@0..59
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "S"
     [email protected] " "
-    TUPLE_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "("
       [email protected] "\n    "
-      TUPLE_FIELD_DEF@15..55
+      [email protected]
         [email protected]
           [email protected] "#"
           [email protected] "["
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0117_macro_call_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0117_macro_call_type.rast
index ddfcf974e..f3d4ad72c 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0117_macro_call_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0117_macro_call_type.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..16
+  [email protected]
     [email protected] "type"
     [email protected] " "
     [email protected]
@@ -18,7 +18,7 @@ [email protected]
         [email protected] ")"
     [email protected] ";"
   [email protected] "\n"
-  TYPE_ALIAS_DEF@17..40
+  [email protected]
     [email protected] "type"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rast b/crates/ra_syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rast
index ea54347fc..f2561abd6 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rast
@@ -1,10 +1,10 @@
 [email protected]
-  ENUM_DEF@0..8
+  [email protected]
     [email protected] "enum"
     [email protected] " "
     [email protected]
       [email protected] "F"
-    ENUM_[email protected]
+    [email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0118_match_guard.rast b/crates/ra_syntax/test_data/parser/inline/ok/0118_match_guard.rast
index e152c6b6c..aaaf803b7 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0118_match_guard.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0118_match_guard.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..57
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rast b/crates/ra_syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rast
index b283ab804..4b5f9cdc9 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..138
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rast b/crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rast
index 9d5470914..54cc3be3a 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..258
+  [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 ada2fc54e..edac8d5d9 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
@@ -1,10 +1,10 @@
 [email protected]
-  FN_DEF@0..63
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
       [email protected] "foo"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [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 b3a33c14d..f155743cf 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
@@ -8,7 +8,7 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] " "
-      FN_DEF@13..54
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0124_async_fn.rast b/crates/ra_syntax/test_data/parser/inline/ok/0124_async_fn.rast
index 6178dfe59..a7df188bd 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0124_async_fn.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0124_async_fn.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..17
+  [email protected]
     [email protected] "async"
     [email protected] " "
     [email protected] "fn"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rast b/crates/ra_syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rast
index ced59b7c1..aa4d7a784 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..26
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rast
index 97611f7f3..54ea2c7c6 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..45
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -11,16 +11,16 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      RECORD_LIT@16..43
+      RECORD_EXPR@16..43
         [email protected]
           [email protected]
             [email protected]
               [email protected] "S"
         [email protected] " "
-        [email protected]
+        RECORD_EXPR_[email protected]
           [email protected] "{"
           [email protected] " "
-          [email protected]
+          RECORD_EXPR_[email protected]
             [email protected]
               [email protected] "#"
               [email protected] "["
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rast b/crates/ra_syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rast
index 09221fc54..0342e64f3 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..81
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rast
index 93cc41533..3b46e5b47 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..46
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0128_combined_fns.rast b/crates/ra_syntax/test_data/parser/inline/ok/0128_combined_fns.rast
index 0901f2348..98a20f36d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0128_combined_fns.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0128_combined_fns.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..24
+  [email protected]
     [email protected] "async"
     [email protected] " "
     [email protected] "unsafe"
@@ -16,7 +16,7 @@ [email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n"
-  FN_DEF@25..49
+  [email protected]
     [email protected] "const"
     [email protected] " "
     [email protected] "unsafe"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0129_marco_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0129_marco_pat.rast
index 28291afc2..e283966ca 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0129_marco_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0129_marco_pat.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..32
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rast b/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rast
index bb94a05c6..931e81f27 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..134
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0130_try_block_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0130_try_block_expr.rast
index 8f2f144c7..0fe3bf582 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0130_try_block_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0130_try_block_expr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..32
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0131_existential_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0131_existential_type.rast
index 4a1c2b3a4..d47071a91 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0131_existential_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0131_existential_type.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..36
+  [email protected]
     [email protected] "existential"
     [email protected] " "
     [email protected] "type"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0132_box_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0132_box_expr.rast
index 87ac42748..48f483813 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0132_box_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0132_box_expr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..105
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0132_default_fn_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0132_default_fn_type.rast
index 3772cb64b..de02238df 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0132_default_fn_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0132_default_fn_type.rast
@@ -19,7 +19,7 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      TYPE_ALIAS_DEF@21..42
+      [email protected]
         [email protected] "default"
         [email protected] " "
         [email protected] "type"
@@ -36,7 +36,7 @@ [email protected]
                 [email protected] "Bar"
         [email protected] ";"
       [email protected] "\n    "
-      FN_DEF@47..66
+      [email protected]
         [email protected] "default"
         [email protected] " "
         [email protected] "fn"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rast b/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rast
index b330a0932..429a0506e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..110
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -11,21 +11,21 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      ENUM_DEF@27..75
+      [email protected]
         [email protected] "enum"
         [email protected] " "
         [email protected]
           [email protected] "LocalEnum"
         [email protected] " "
-        ENUM_[email protected]
+        [email protected]
           [email protected] "{"
           [email protected] "\n        "
-          ENUM_[email protected]
+          [email protected]
             [email protected]
               [email protected] "One"
           [email protected] ","
           [email protected] "\n        "
-          ENUM_[email protected]
+          [email protected]
             [email protected]
               [email protected] "Two"
           [email protected] ","
@@ -33,7 +33,7 @@ [email protected]
           [email protected] "}"
       [email protected] ";"
       [email protected] "\n    "
-      FN_DEF@81..90
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -47,13 +47,13 @@ [email protected]
           [email protected] "}"
       [email protected] ";"
       [email protected] "\n    "
-      STRUCT_DEF@96..107
+      [email protected]
         [email protected] "struct"
         [email protected] " "
         [email protected]
           [email protected] "S"
         [email protected] " "
-        RECORD_FIELD_DEF_[email protected]
+        [email protected]
           [email protected] "{"
           [email protected] "}"
       [email protected] ";"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0137_await_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0137_await_expr.rast
index 8e8d9e992..923effe38 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0137_await_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0137_await_expr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..66
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast b/crates/ra_syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast
index c457851c9..157513565 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast
@@ -1,10 +1,10 @@
 [email protected]
-  FN_DEF@0..58
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
       [email protected] "print_all"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0138_expression_after_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0138_expression_after_block.rast
index ea325831e..a7f87c020 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0138_expression_after_block.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0138_expression_after_block.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..51
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -22,14 +22,14 @@ [email protected]
         [email protected] " "
         [email protected] "="
         [email protected] " "
-        RECORD_LIT@26..33
+        RECORD_EXPR@26..33
           [email protected]
             [email protected]
               [email protected]
                 [email protected] "F"
-          [email protected]
+          RECORD_EXPR_[email protected]
             [email protected] "{"
-            [email protected]
+            RECORD_EXPR_[email protected]
               [email protected]
                 [email protected] "x"
               [email protected] ":"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rast
index 9135de9df..6403ff8d5 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..25
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0139_param_outer_arg.rast b/crates/ra_syntax/test_data/parser/inline/ok/0139_param_outer_arg.rast
index 14610a0a2..36fd2997b 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0139_param_outer_arg.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0139_param_outer_arg.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..27
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0142_for_range_from.rast b/crates/ra_syntax/test_data/parser/inline/ok/0142_for_range_from.rast
index e6be8b7e4..d11019076 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0142_for_range_from.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0142_for_range_from.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..50
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.rast
index 57fba5fd5..09fd9e9b8 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..117
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0144_dot_dot_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0144_dot_dot_pat.rast
index 8d8b9597b..8d0f1ead5 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0144_dot_dot_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0144_dot_dot_pat.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..554
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0145_record_field_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0145_record_field_pat.rast
index 7c092d518..b41ef4098 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0145_record_field_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0145_record_field_pat.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..62
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [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 8382a4f96..2d0c83458 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
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..42
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0147_const_param.rast b/crates/ra_syntax/test_data/parser/inline/ok/0147_const_param.rast
index 4b9b8e0ab..9312eab65 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0147_const_param.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0147_const_param.rast
@@ -1,10 +1,10 @@
 [email protected]
-  STRUCT_DEF@0..23
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "S"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected] "const"
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 3c00a2647..0c35bf2b7 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
@@ -1,5 +1,5 @@
 [email protected]
-  CONST_DEF@0..39
+  [email protected]
     [email protected] "const"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0150_impl_type_params.rast b/crates/ra_syntax/test_data/parser/inline/ok/0150_impl_type_params.rast
index 77e12cad6..07e555d63 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0150_impl_type_params.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0150_impl_type_params.rast
@@ -1,7 +1,7 @@
 [email protected]
   [email protected]
     [email protected] "impl"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected] "const"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0151_trait_alias.rast b/crates/ra_syntax/test_data/parser/inline/ok/0151_trait_alias.rast
index 48d73a4e7..e2a770a37 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0151_trait_alias.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0151_trait_alias.rast
@@ -4,7 +4,7 @@ [email protected]
     [email protected] " "
     [email protected]
       [email protected] "Z"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected]
@@ -36,7 +36,7 @@ [email protected]
     [email protected] " "
     [email protected]
       [email protected] "Z"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected]
@@ -87,7 +87,7 @@ [email protected]
     [email protected] " "
     [email protected]
       [email protected] "Z"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0152_arg_with_attr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0152_arg_with_attr.rast
index f43dfbe63..2905c5f1a 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0152_arg_with_attr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0152_arg_with_attr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..33
+  [email protected]
     [email protected] "fn"
     [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 861065362..69b4d73d7 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
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..24
+  [email protected]
     [email protected] "type"
     [email protected] " "
     [email protected]
@@ -25,7 +25,7 @@ [email protected]
         [email protected] ")"
     [email protected] ";"
   [email protected] "\n"
-  TYPE_ALIAS_DEF@25..54
+  [email protected]
     [email protected] "type"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0155_closure_params.rast b/crates/ra_syntax/test_data/parser/inline/ok/0155_closure_params.rast
index ecac05950..c63a55a56 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0155_closure_params.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0155_closure_params.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..62
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0156_fn_def_param.rast b/crates/ra_syntax/test_data/parser/inline/ok/0156_fn_def_param.rast
index 092833417..3b8dfefc6 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0156_fn_def_param.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0156_fn_def_param.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..29
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0156_or_pattern.rast b/crates/ra_syntax/test_data/parser/inline/ok/0156_or_pattern.rast
index 88d512f1a..4d4c41f1a 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0156_or_pattern.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0156_or_pattern.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..129
+  [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 fad9df007..ccca045b6 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
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..22
+  [email protected]
     [email protected] "type"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0157_variant_discriminant.rast b/crates/ra_syntax/test_data/parser/inline/ok/0157_variant_discriminant.rast
index e8a0e9ddd..a2e05eb2e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0157_variant_discriminant.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0157_variant_discriminant.rast
@@ -1,19 +1,19 @@
 [email protected]
-  ENUM_DEF@0..22
+  [email protected]
     [email protected] "enum"
     [email protected] " "
     [email protected]
       [email protected] "E"
     [email protected] " "
-    ENUM_[email protected]
+    [email protected]
       [email protected] "{"
       [email protected] " "
-      ENUM_[email protected]
+      [email protected]
         [email protected]
           [email protected] "X"
-        TUPLE_FIELD_DEF_[email protected]
+        [email protected]
           [email protected] "("
-          TUPLE_FIELD_DEF@11..14
+          [email protected]
             [email protected]
               [email protected]
                 [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0158_binop_resets_statementness.rast b/crates/ra_syntax/test_data/parser/inline/ok/0158_binop_resets_statementness.rast
index bd9e8d40f..8ae24b9c1 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0158_binop_resets_statementness.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0158_binop_resets_statementness.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..27
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0158_lambda_ret_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0158_lambda_ret_block.rast
index 08333a325..9c071ec2e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0158_lambda_ret_block.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0158_lambda_ret_block.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..33
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0159_try_macro_fallback.rast b/crates/ra_syntax/test_data/parser/inline/ok/0159_try_macro_fallback.rast
index 5f09e4f4a..fb46d4ce4 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0159_try_macro_fallback.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0159_try_macro_fallback.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..26
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0161_labeled_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0161_labeled_block.rast
index 9efebd8b8..9e9a5f9c5 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0161_labeled_block.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0161_labeled_block.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..22
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0162_unsafe_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0162_unsafe_block.rast
index 4991f2c36..ca9a1183d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0162_unsafe_block.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0162_unsafe_block.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..21
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_fn.rast b/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_fn.rast
index c0b8c0300..680f35445 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_fn.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_fn.rast
@@ -19,7 +19,7 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      FN_DEF@21..47
+      [email protected]
         [email protected] "default"
         [email protected] " "
         [email protected] "unsafe"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0164_type_path_in_pattern.rast b/crates/ra_syntax/test_data/parser/inline/ok/0164_type_path_in_pattern.rast
index 868899275..f5e20b93d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0164_type_path_in_pattern.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0164_type_path_in_pattern.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..32
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0001_struct_item.rast b/crates/ra_syntax/test_data/parser/ok/0001_struct_item.rast
index 705f7e001..a171fe7a8 100644
--- a/crates/ra_syntax/test_data/parser/ok/0001_struct_item.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0001_struct_item.rast
@@ -1,10 +1,10 @@
 [email protected]
-  STRUCT_DEF@0..31
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "S"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected]
@@ -20,10 +20,10 @@ [email protected]
                     [email protected] "Copy"
       [email protected] ">"
     [email protected] " "
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      RECORD_FIELD_DEF@24..28
+      [email protected]
         [email protected]
           [email protected] "f"
         [email protected] ":"
diff --git a/crates/ra_syntax/test_data/parser/ok/0002_struct_item_field.rast b/crates/ra_syntax/test_data/parser/ok/0002_struct_item_field.rast
index a1d546491..362892b91 100644
--- a/crates/ra_syntax/test_data/parser/ok/0002_struct_item_field.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0002_struct_item_field.rast
@@ -1,14 +1,14 @@
 [email protected]
-  STRUCT_DEF@0..25
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "S"
     [email protected] " "
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      RECORD_FIELD_DEF@15..23
+      [email protected]
         [email protected]
           [email protected] "foo"
         [email protected] ":"
diff --git a/crates/ra_syntax/test_data/parser/ok/0005_fn_item.rast b/crates/ra_syntax/test_data/parser/ok/0005_fn_item.rast
index 0ec237f8e..a7a2b11a7 100644
--- a/crates/ra_syntax/test_data/parser/ok/0005_fn_item.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0005_fn_item.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..12
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0008_mod_item.rast b/crates/ra_syntax/test_data/parser/ok/0008_mod_item.rast
index 37b452ec4..b2c1d791f 100644
--- a/crates/ra_syntax/test_data/parser/ok/0008_mod_item.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0008_mod_item.rast
@@ -26,7 +26,7 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      FN_DEF@31..47
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -40,13 +40,13 @@ [email protected]
           [email protected] "\n    "
           [email protected] "}"
       [email protected] "\n    "
-      STRUCT_DEF@52..63
+      [email protected]
         [email protected] "struct"
         [email protected] " "
         [email protected]
           [email protected] "S"
         [email protected] " "
-        RECORD_FIELD_DEF_[email protected]
+        [email protected]
           [email protected] "{"
           [email protected] "}"
       [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0011_outer_attribute.rast b/crates/ra_syntax/test_data/parser/ok/0011_outer_attribute.rast
index 0b9bc58e8..478fdba75 100644
--- a/crates/ra_syntax/test_data/parser/ok/0011_outer_attribute.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0011_outer_attribute.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..34
+  [email protected]
     [email protected]
       [email protected] "#"
       [email protected] "["
diff --git a/crates/ra_syntax/test_data/parser/ok/0012_visibility.rast b/crates/ra_syntax/test_data/parser/ok/0012_visibility.rast
index 980b34049..83a93b5a9 100644
--- a/crates/ra_syntax/test_data/parser/ok/0012_visibility.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0012_visibility.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..9
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -12,7 +12,7 @@ [email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n"
-  FN_DEF@10..23
+  [email protected]
     [email protected]
       [email protected] "pub"
     [email protected] " "
@@ -28,7 +28,7 @@ [email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n"
-  FN_DEF@24..44
+  [email protected]
     [email protected]
       [email protected] "pub"
       [email protected] "("
@@ -47,7 +47,7 @@ [email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n"
-  FN_DEF@45..65
+  [email protected]
     [email protected]
       [email protected] "pub"
       [email protected] "("
@@ -66,7 +66,7 @@ [email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n"
-  FN_DEF@66..97
+  [email protected]
     [email protected]
       [email protected] "pub"
       [email protected] "("
diff --git a/crates/ra_syntax/test_data/parser/ok/0016_struct_flavors.rast b/crates/ra_syntax/test_data/parser/ok/0016_struct_flavors.rast
index 95656d19b..b15f41dd7 100644
--- a/crates/ra_syntax/test_data/parser/ok/0016_struct_flavors.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0016_struct_flavors.rast
@@ -1,41 +1,41 @@
 [email protected]
-  STRUCT_DEF@0..9
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "A"
     [email protected] ";"
   [email protected] "\n"
-  STRUCT_DEF@10..21
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "B"
     [email protected] " "
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n"
-  STRUCT_DEF@22..33
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "C"
-    TUPLE_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "("
       [email protected] ")"
     [email protected] ";"
   [email protected] "\n\n"
-  STRUCT_DEF@35..74
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "D"
     [email protected] " "
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      RECORD_FIELD_DEF@50..56
+      [email protected]
         [email protected]
           [email protected] "a"
         [email protected] ":"
@@ -47,7 +47,7 @@ [email protected]
                 [email protected] "u32"
       [email protected] ","
       [email protected] "\n    "
-      RECORD_FIELD_DEF@62..72
+      [email protected]
         [email protected]
           [email protected] "pub"
         [email protected] " "
@@ -63,14 +63,14 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n\n"
-  STRUCT_DEF@76..96
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "E"
-    TUPLE_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "("
-      TUPLE_FIELD_DEF@85..90
+      [email protected]
         [email protected]
           [email protected] "pub"
         [email protected] " "
@@ -81,7 +81,7 @@ [email protected]
                 [email protected] "x"
       [email protected] ","
       [email protected] " "
-      TUPLE_FIELD_DEF@92..93
+      [email protected]
         [email protected]
           [email protected]
             [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0017_attr_trailing_comma.rast b/crates/ra_syntax/test_data/parser/ok/0017_attr_trailing_comma.rast
index 964cbf5dd..a3e091ad3 100644
--- a/crates/ra_syntax/test_data/parser/ok/0017_attr_trailing_comma.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0017_attr_trailing_comma.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..22
+  [email protected]
     [email protected]
       [email protected] "#"
       [email protected] "["
diff --git a/crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.rast b/crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.rast
index 451634e3f..630aa0708 100644
--- a/crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.rast
@@ -1,10 +1,10 @@
 [email protected]
-  STRUCT_DEF@0..13
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "S1"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected]
@@ -12,20 +12,20 @@ [email protected]
       [email protected] ">"
     [email protected] ";"
   [email protected] "\n"
-  STRUCT_DEF@14..32
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "S2"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected]
           [email protected] "T"
       [email protected] ">"
-    TUPLE_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "("
-      TUPLE_FIELD_DEF@27..30
+      [email protected]
         [email protected]
           [email protected]
             [email protected]
@@ -34,22 +34,22 @@ [email protected]
       [email protected] ")"
     [email protected] ";"
   [email protected] "\n"
-  STRUCT_DEF@33..56
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "S3"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected]
           [email protected] "T"
       [email protected] ">"
     [email protected] " "
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "{"
       [email protected] " "
-      RECORD_FIELD_DEF@48..54
+      [email protected]
         [email protected]
           [email protected] "u"
         [email protected] ":"
@@ -62,34 +62,34 @@ [email protected]
       [email protected] " "
       [email protected] "}"
   [email protected] "\n\n"
-  STRUCT_DEF@58..70
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "S4"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected] ">"
     [email protected] ";"
   [email protected] "\n"
-  STRUCT_DEF@71..85
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "S5"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected] "\'a"
       [email protected] ">"
     [email protected] ";"
   [email protected] "\n"
-  STRUCT_DEF@86..101
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "S6"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected] "\'a"
@@ -97,12 +97,12 @@ [email protected]
       [email protected] ">"
     [email protected] ";"
   [email protected] "\n"
-  STRUCT_DEF@102..120
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "S7"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected] "\'a"
@@ -112,12 +112,12 @@ [email protected]
       [email protected] ">"
     [email protected] ";"
   [email protected] "\n"
-  STRUCT_DEF@121..142
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "S8"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected] "\'a"
@@ -130,12 +130,12 @@ [email protected]
       [email protected] ">"
     [email protected] ";"
   [email protected] "\n"
-  STRUCT_DEF@143..166
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "S9"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected] "\'a"
@@ -149,12 +149,12 @@ [email protected]
       [email protected] ">"
     [email protected] ";"
   [email protected] "\n"
-  STRUCT_DEF@167..183
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "S10"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected] "\'a"
@@ -162,12 +162,12 @@ [email protected]
       [email protected] ">"
     [email protected] ";"
   [email protected] "\n"
-  STRUCT_DEF@184..203
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "S11"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected] "\'a"
@@ -178,12 +178,12 @@ [email protected]
       [email protected] ">"
     [email protected] ";"
   [email protected] "\n"
-  STRUCT_DEF@204..233
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "S12"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected] "\'a"
@@ -202,12 +202,12 @@ [email protected]
       [email protected] ">"
     [email protected] ";"
   [email protected] "\n\n"
-  STRUCT_DEF@235..249
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "S13"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected]
@@ -215,12 +215,12 @@ [email protected]
       [email protected] ">"
     [email protected] ";"
   [email protected] "\n"
-  STRUCT_DEF@250..267
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "S14"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected]
@@ -233,12 +233,12 @@ [email protected]
       [email protected] ">"
     [email protected] ";"
   [email protected] "\n"
-  STRUCT_DEF@268..289
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "S15"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected] "\'a"
diff --git a/crates/ra_syntax/test_data/parser/ok/0019_enums.rast b/crates/ra_syntax/test_data/parser/ok/0019_enums.rast
index f767e9e19..c3df00814 100644
--- a/crates/ra_syntax/test_data/parser/ok/0019_enums.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0019_enums.rast
@@ -1,78 +1,78 @@
 [email protected]
-  ENUM_DEF@0..11
+  [email protected]
     [email protected] "enum"
     [email protected] " "
     [email protected]
       [email protected] "E1"
     [email protected] " "
-    ENUM_[email protected]
+    [email protected]
       [email protected] "{"
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n\n"
-  ENUM_DEF@13..27
+  [email protected]
     [email protected] "enum"
     [email protected] " "
     [email protected]
       [email protected] "E2"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected]
           [email protected] "T"
       [email protected] ">"
     [email protected] " "
-    ENUM_[email protected]
+    [email protected]
       [email protected] "{"
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n\n"
-  ENUM_DEF@29..46
+  [email protected]
     [email protected] "enum"
     [email protected] " "
     [email protected]
       [email protected] "E3"
     [email protected] " "
-    ENUM_[email protected]
+    [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      ENUM_[email protected]
+      [email protected]
         [email protected]
           [email protected] "X"
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n\n"
-  ENUM_DEF@48..66
+  [email protected]
     [email protected] "enum"
     [email protected] " "
     [email protected]
       [email protected] "E4"
     [email protected] " "
-    ENUM_[email protected]
+    [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      ENUM_[email protected]
+      [email protected]
         [email protected]
           [email protected] "X"
       [email protected] ","
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n\n"
-  ENUM_DEF@68..181
+  [email protected]
     [email protected] "enum"
     [email protected] " "
     [email protected]
       [email protected] "E5"
     [email protected] " "
-    ENUM_[email protected]
+    [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      ENUM_[email protected]
+      [email protected]
         [email protected]
           [email protected] "A"
       [email protected] ","
       [email protected] "\n    "
-      ENUM_[email protected]
+      [email protected]
         [email protected]
           [email protected] "B"
         [email protected] " "
@@ -82,14 +82,14 @@ [email protected]
           [email protected] "92"
       [email protected] ","
       [email protected] "\n    "
-      ENUM_[email protected]
+      [email protected]
         [email protected]
           [email protected] "C"
         [email protected] " "
-        RECORD_FIELD_DEF_[email protected]
+        [email protected]
           [email protected] "{"
           [email protected] "\n        "
-          RECORD_FIELD_DEF@113..119
+          [email protected]
             [email protected]
               [email protected] "a"
             [email protected] ":"
@@ -101,7 +101,7 @@ [email protected]
                     [email protected] "u32"
           [email protected] ","
           [email protected] "\n        "
-          RECORD_FIELD_DEF@129..139
+          [email protected]
             [email protected]
               [email protected] "pub"
             [email protected] " "
@@ -119,21 +119,21 @@ [email protected]
           [email protected] "}"
       [email protected] ","
       [email protected] "\n    "
-      ENUM_[email protected]
+      [email protected]
         [email protected]
           [email protected] "F"
         [email protected] " "
-        RECORD_FIELD_DEF_[email protected]
+        [email protected]
           [email protected] "{"
           [email protected] "}"
       [email protected] ","
       [email protected] "\n    "
-      ENUM_[email protected]
+      [email protected]
         [email protected]
           [email protected] "D"
-        TUPLE_FIELD_DEF_[email protected]
+        [email protected]
           [email protected] "("
-          TUPLE_FIELD_DEF@164..167
+          [email protected]
             [email protected]
               [email protected]
                 [email protected]
@@ -143,10 +143,10 @@ [email protected]
           [email protected] ")"
       [email protected] ","
       [email protected] "\n    "
-      ENUM_[email protected]
+      [email protected]
         [email protected]
           [email protected] "E"
-        TUPLE_FIELD_DEF_[email protected]
+        [email protected]
           [email protected] "("
           [email protected] ")"
       [email protected] ","
diff --git a/crates/ra_syntax/test_data/parser/ok/0020_type_param_bounds.rast b/crates/ra_syntax/test_data/parser/ok/0020_type_param_bounds.rast
index 4fb4baf56..9bdc50e1e 100644
--- a/crates/ra_syntax/test_data/parser/ok/0020_type_param_bounds.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0020_type_param_bounds.rast
@@ -1,10 +1,10 @@
 [email protected]
-  STRUCT_DEF@0..12
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "A"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected]
@@ -12,12 +12,12 @@ [email protected]
       [email protected] ">"
     [email protected] ";"
   [email protected] "\n"
-  STRUCT_DEF@13..26
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "B"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected]
@@ -27,12 +27,12 @@ [email protected]
       [email protected] ">"
     [email protected] ";"
   [email protected] "\n"
-  STRUCT_DEF@27..43
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "C"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected]
@@ -45,12 +45,12 @@ [email protected]
       [email protected] ">"
     [email protected] ";"
   [email protected] "\n"
-  STRUCT_DEF@44..63
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "D"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected]
@@ -66,12 +66,12 @@ [email protected]
       [email protected] ">"
     [email protected] ";"
   [email protected] "\n"
-  STRUCT_DEF@64..86
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "E"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected]
@@ -90,12 +90,12 @@ [email protected]
       [email protected] ">"
     [email protected] ";"
   [email protected] "\n"
-  STRUCT_DEF@87..116
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "F"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected]
@@ -122,12 +122,12 @@ [email protected]
       [email protected] ">"
     [email protected] ";"
   [email protected] "\n"
-  STRUCT_DEF@117..143
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "G"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected]
@@ -153,12 +153,12 @@ [email protected]
       [email protected] ">"
     [email protected] ";"
   [email protected] "\n"
-  STRUCT_DEF@144..180
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "H"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected]
@@ -194,12 +194,12 @@ [email protected]
       [email protected] ">"
     [email protected] ";"
   [email protected] "\n"
-  STRUCT_DEF@181..199
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "I"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected]
@@ -217,12 +217,12 @@ [email protected]
       [email protected] ">"
     [email protected] ";"
   [email protected] "\n"
-  STRUCT_DEF@200..250
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "K"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected] "\'a"
diff --git a/crates/ra_syntax/test_data/parser/ok/0021_extern_fn.rast b/crates/ra_syntax/test_data/parser/ok/0021_extern_fn.rast
index 873791f50..5524efaaf 100644
--- a/crates/ra_syntax/test_data/parser/ok/0021_extern_fn.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0021_extern_fn.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..19
+  [email protected]
     [email protected]
       [email protected] "extern"
     [email protected] " "
@@ -16,7 +16,7 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@21..44
+  [email protected]
     [email protected]
       [email protected] "extern"
       [email protected] " "
@@ -35,7 +35,7 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@46..70
+  [email protected]
     [email protected]
       [email protected] "extern"
       [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/ok/0023_static_items.rast b/crates/ra_syntax/test_data/parser/ok/0023_static_items.rast
index 97d90dc75..9374cf5e9 100644
--- a/crates/ra_syntax/test_data/parser/ok/0023_static_items.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0023_static_items.rast
@@ -1,5 +1,5 @@
 [email protected]
-  STATIC_DEF@0..20
+  [email protected]
     [email protected] "static"
     [email protected] " "
     [email protected]
@@ -18,7 +18,7 @@ [email protected]
       [email protected] "1"
     [email protected] ";"
   [email protected] "\n"
-  STATIC_DEF@21..46
+  [email protected]
     [email protected] "static"
     [email protected] " "
     [email protected] "mut"
diff --git a/crates/ra_syntax/test_data/parser/ok/0024_const_item.rast b/crates/ra_syntax/test_data/parser/ok/0024_const_item.rast
index d241f034c..dd1b9c9a0 100644
--- a/crates/ra_syntax/test_data/parser/ok/0024_const_item.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0024_const_item.rast
@@ -1,5 +1,5 @@
 [email protected]
-  CONST_DEF@0..17
+  [email protected]
     [email protected] "const"
     [email protected] " "
     [email protected] "_"
@@ -17,7 +17,7 @@ [email protected]
       [email protected] "0"
     [email protected] ";"
   [email protected] "\n"
-  CONST_DEF@18..38
+  [email protected]
     [email protected] "const"
     [email protected] " "
     [email protected]
@@ -36,7 +36,7 @@ [email protected]
       [email protected] "92"
     [email protected] ";"
   [email protected] "\n"
-  CONST_DEF@39..63
+  [email protected]
     [email protected] "const"
     [email protected] " "
     [email protected] "mut"
diff --git a/crates/ra_syntax/test_data/parser/ok/0025_extern_fn_in_block.rast b/crates/ra_syntax/test_data/parser/ok/0025_extern_fn_in_block.rast
index 5701f566e..bb6527b48 100644
--- a/crates/ra_syntax/test_data/parser/ok/0025_extern_fn_in_block.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0025_extern_fn_in_block.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..34
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -11,7 +11,7 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      FN_DEF@16..32
+      [email protected]
         [email protected]
           [email protected] "extern"
         [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/ok/0026_const_fn_in_block.rast b/crates/ra_syntax/test_data/parser/ok/0026_const_fn_in_block.rast
index b029d8692..5bcf54deb 100644
--- a/crates/ra_syntax/test_data/parser/ok/0026_const_fn_in_block.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0026_const_fn_in_block.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..33
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -11,7 +11,7 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      FN_DEF@16..31
+      [email protected]
         [email protected] "const"
         [email protected] " "
         [email protected] "fn"
diff --git a/crates/ra_syntax/test_data/parser/ok/0027_unsafe_fn_in_block.rast b/crates/ra_syntax/test_data/parser/ok/0027_unsafe_fn_in_block.rast
index 299bbd136..a7cc12295 100644
--- a/crates/ra_syntax/test_data/parser/ok/0027_unsafe_fn_in_block.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0027_unsafe_fn_in_block.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..52
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -11,7 +11,7 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      FN_DEF@16..32
+      [email protected]
         [email protected] "unsafe"
         [email protected] " "
         [email protected] "fn"
diff --git a/crates/ra_syntax/test_data/parser/ok/0028_operator_binding_power.rast b/crates/ra_syntax/test_data/parser/ok/0028_operator_binding_power.rast
index de3c4b786..efe018484 100644
--- a/crates/ra_syntax/test_data/parser/ok/0028_operator_binding_power.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0028_operator_binding_power.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..247
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0029_range_forms.rast b/crates/ra_syntax/test_data/parser/ok/0029_range_forms.rast
index dc47d68a6..47e46f009 100644
--- a/crates/ra_syntax/test_data/parser/ok/0029_range_forms.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0029_range_forms.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..152
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0030_string_suffixes.rast b/crates/ra_syntax/test_data/parser/ok/0030_string_suffixes.rast
index 86c3b46c4..93f766149 100644
--- a/crates/ra_syntax/test_data/parser/ok/0030_string_suffixes.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0030_string_suffixes.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..111
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0030_traits.rast b/crates/ra_syntax/test_data/parser/ok/0030_traits.rast
index 63693de4f..4bcf07ffb 100644
--- a/crates/ra_syntax/test_data/parser/ok/0030_traits.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0030_traits.rast
@@ -8,7 +8,7 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      FN_DEF@21..34
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -29,7 +29,7 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      FN_DEF@64..93
+      [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 ea285f52f..0509f7504 100644
--- a/crates/ra_syntax/test_data/parser/ok/0031_extern.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0031_extern.rast
@@ -6,7 +6,7 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      FN_DEF@13..87
+      [email protected]
         [email protected]
           [email protected] "pub"
         [email protected] " "
@@ -69,7 +69,7 @@ [email protected]
                   [email protected] "c_int"
         [email protected] ";"
       [email protected] "\n    "
-      FN_DEF@92..167
+      [email protected]
         [email protected]
           [email protected] "pub"
         [email protected] " "
@@ -134,7 +134,7 @@ [email protected]
                   [email protected] "c_int"
         [email protected] ";"
       [email protected] "\n    "
-      FN_DEF@172..276
+      [email protected]
         [email protected]
           [email protected] "pub"
         [email protected] " "
@@ -199,7 +199,7 @@ [email protected]
                   [email protected] "c_int"
         [email protected] ";"
       [email protected] "\n    "
-      FN_DEF@281..341
+      [email protected]
         [email protected]
           [email protected] "pub"
         [email protected] " "
@@ -248,7 +248,7 @@ [email protected]
                   [email protected] "c_int"
         [email protected] ";"
       [email protected] "\n    "
-      FN_DEF@346..469
+      [email protected]
         [email protected]
           [email protected] "pub"
         [email protected] " "
@@ -317,7 +317,7 @@ [email protected]
                   [email protected] "c_int"
         [email protected] ";"
       [email protected] "\n    "
-      FN_DEF@474..691
+      [email protected]
         [email protected]
           [email protected] "pub"
         [email protected] " "
@@ -416,7 +416,7 @@ [email protected]
                   [email protected] "c_int"
         [email protected] ";"
       [email protected] "\n    "
-      FN_DEF@696..864
+      [email protected]
         [email protected]
           [email protected] "pub"
         [email protected] " "
@@ -510,7 +510,7 @@ [email protected]
                   [email protected] "c_int"
         [email protected] ";"
       [email protected] "\n    "
-      FN_DEF@869..992
+      [email protected]
         [email protected]
           [email protected] "pub"
         [email protected] " "
@@ -579,7 +579,7 @@ [email protected]
                   [email protected] "c_int"
         [email protected] ";"
       [email protected] "\n    "
-      FN_DEF@997..1173
+      [email protected]
         [email protected]
           [email protected] "pub"
         [email protected] " "
@@ -690,7 +690,7 @@ [email protected]
                   [email protected] "ssize_t"
         [email protected] ";"
       [email protected] "\n    "
-      FN_DEF@1178..1289
+      [email protected]
         [email protected]
           [email protected] "pub"
         [email protected] " "
@@ -771,7 +771,7 @@ [email protected]
                   [email protected] "ssize_t"
         [email protected] ";"
       [email protected] "\n    "
-      FN_DEF@1294..1481
+      [email protected]
         [email protected]
           [email protected] "pub"
         [email protected] " "
@@ -888,7 +888,7 @@ [email protected]
                   [email protected] "ssize_t"
         [email protected] ";"
       [email protected] "\n    "
-      FN_DEF@1486..1595
+      [email protected]
         [email protected]
           [email protected] "pub"
         [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/ok/0032_where_for.rast b/crates/ra_syntax/test_data/parser/ok/0032_where_for.rast
index 8d76c4e0b..10da87c71 100644
--- a/crates/ra_syntax/test_data/parser/ok/0032_where_for.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0032_where_for.rast
@@ -1,10 +1,10 @@
 [email protected]
-  FN_DEF@0..115
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
       [email protected] "test_serialization"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected]
@@ -38,7 +38,7 @@ [email protected]
           [email protected]
             [email protected]
               [email protected] "for"
-              TYP[email protected]
+              GENERIC[email protected]
                 [email protected] "<"
                 [email protected]
                   [email protected] "\'de"
diff --git a/crates/ra_syntax/test_data/parser/ok/0033_label_break.rast b/crates/ra_syntax/test_data/parser/ok/0033_label_break.rast
index 13b730ded..b3f29638c 100644
--- a/crates/ra_syntax/test_data/parser/ok/0033_label_break.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0033_label_break.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..505
+  [email protected]
     [email protected] "// format with label  ..."
     [email protected] "\n"
     [email protected] "fn"
diff --git a/crates/ra_syntax/test_data/parser/ok/0034_crate_path_in_call.rast b/crates/ra_syntax/test_data/parser/ok/0034_crate_path_in_call.rast
index 21874ae3a..5ad8c570d 100644
--- a/crates/ra_syntax/test_data/parser/ok/0034_crate_path_in_call.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0034_crate_path_in_call.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..61
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [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 bbdf896d1..b04a505ea 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
@@ -120,7 +120,7 @@ [email protected]
   [email protected] "\n\n"
   [email protected] "// Just a grab bag of ..."
   [email protected] "\n\n"
-  FN_DEF@520..572
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -166,7 +166,7 @@ [email protected]
       [email protected] " "
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@574..624
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -178,7 +178,7 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      FN_DEF@591..607
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -217,7 +217,7 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@626..816
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -229,7 +229,7 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      FN_DEF@642..720
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -407,7 +407,7 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@818..1322
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -572,7 +572,7 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@1324..1539
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -809,7 +809,7 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@1541..1741
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -830,7 +830,7 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      FN_DEF@1575..1598
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -988,7 +988,7 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@1743..1904
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -1131,7 +1131,7 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@1906..1960
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -1166,7 +1166,7 @@ [email protected]
       [email protected] " "
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@1962..2198
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -1284,7 +1284,7 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@2200..2693
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -1468,7 +1468,7 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@2695..2832
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -1548,7 +1548,7 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@2834..2906
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -1560,21 +1560,21 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      UNION_DEF@2851..2904
+      [email protected]
         [email protected] "union"
         [email protected] " "
         [email protected]
           [email protected] "union"
-        TYP[email protected]
+        GENERIC[email protected]
           [email protected] "<"
           [email protected]
             [email protected] "\'union"
           [email protected] ">"
         [email protected] " "
-        RECORD_FIELD_DEF_[email protected]
+        [email protected]
           [email protected] "{"
           [email protected] " "
-          RECORD_FIELD_DEF@2873..2901
+          [email protected]
             [email protected]
               [email protected] "union"
             [email protected] ":"
@@ -1599,7 +1599,7 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@2908..3042
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -1722,7 +1722,7 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@3044..3514
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -2056,7 +2056,7 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@3516..3552
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -2090,7 +2090,7 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@3554..3812
+  [email protected]
     [email protected]
       [email protected] "pub"
     [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/ok/0036_fully_qualified.rast b/crates/ra_syntax/test_data/parser/ok/0036_fully_qualified.rast
index a64a82e94..c4da317b9 100644
--- a/crates/ra_syntax/test_data/parser/ok/0036_fully_qualified.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0036_fully_qualified.rast
@@ -1,7 +1,7 @@
 [email protected]
   [email protected] "// https://github.com ..."
   [email protected] "\n\n"
-  FN_DEF@62..156
+  [email protected]
     [email protected]
       [email protected] "pub"
     [email protected] " "
@@ -9,7 +9,7 @@ [email protected]
     [email protected] " "
     [email protected]
       [email protected] "foo"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0038_where_pred_type.rast b/crates/ra_syntax/test_data/parser/ok/0038_where_pred_type.rast
index 7fd414090..22168eaf1 100644
--- a/crates/ra_syntax/test_data/parser/ok/0038_where_pred_type.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0038_where_pred_type.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..34
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0039_raw_fn_item.rast b/crates/ra_syntax/test_data/parser/ok/0039_raw_fn_item.rast
index 17be2c238..68a366354 100644
--- a/crates/ra_syntax/test_data/parser/ok/0039_raw_fn_item.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0039_raw_fn_item.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..14
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0040_raw_struct_item_field.rast b/crates/ra_syntax/test_data/parser/ok/0040_raw_struct_item_field.rast
index 5640bae0a..8cfc14f49 100644
--- a/crates/ra_syntax/test_data/parser/ok/0040_raw_struct_item_field.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0040_raw_struct_item_field.rast
@@ -1,14 +1,14 @@
 [email protected]
-  STRUCT_DEF@0..27
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "S"
     [email protected] " "
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      RECORD_FIELD_DEF@15..25
+      [email protected]
         [email protected]
           [email protected] "r#foo"
         [email protected] ":"
diff --git a/crates/ra_syntax/test_data/parser/ok/0041_raw_keywords.rast b/crates/ra_syntax/test_data/parser/ok/0041_raw_keywords.rast
index acf32a852..92ede8ccb 100644
--- a/crates/ra_syntax/test_data/parser/ok/0041_raw_keywords.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0041_raw_keywords.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..59
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast b/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast
index 573edc081..c4ffc0a3d 100644
--- a/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast
@@ -1,7 +1,7 @@
 [email protected]
   [email protected] "// https://github.com ..."
   [email protected] "\n\n"
-  STRUCT_DEF@62..73
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
@@ -20,7 +20,7 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      FN_DEF@90..139
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -55,7 +55,7 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@143..161
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -78,7 +78,7 @@ [email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@163..198
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.rast b/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.rast
index 900eeb445..adc4a22e9 100644
--- a/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.rast
@@ -1,16 +1,16 @@
 [email protected]
   [email protected] "// https://github.com ..."
   [email protected] "\n\n"
-  STRUCT_DEF@62..90
+  [email protected]
     [email protected] "struct"
     [email protected] " "
     [email protected]
       [email protected] "Repr"
     [email protected] " "
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
       [email protected] "{"
       [email protected] " "
-      RECORD_FIELD_DEF@76..88
+      [email protected]
         [email protected]
           [email protected] "raw"
         [email protected] ":"
@@ -30,7 +30,7 @@ [email protected]
       [email protected] " "
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@92..159
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -46,16 +46,16 @@ [email protected]
         [email protected]
           [email protected]
             [email protected]
-              RECORD_LIT@107..124
+              RECORD_EXPR@107..124
                 [email protected]
                   [email protected]
                     [email protected]
                       [email protected] "Repr"
                 [email protected] " "
-                [email protected]
+                RECORD_EXPR_[email protected]
                   [email protected] "{"
                   [email protected] " "
-                  [email protected]
+                  RECORD_EXPR_[email protected]
                     [email protected]
                       [email protected] "raw"
                     [email protected] ":"
@@ -83,14 +83,14 @@ [email protected]
       [email protected] "\n    "
       [email protected]
         [email protected]
-          RECORD_LIT@141..154
+          RECORD_EXPR@141..154
             [email protected]
               [email protected]
                 [email protected]
                   [email protected] "Repr"
-            [email protected]
+            RECORD_EXPR_[email protected]
               [email protected] "{"
-              [email protected]
+              RECORD_EXPR_[email protected]
                 [email protected]
                   [email protected] "raw"
                 [email protected] ":"
diff --git a/crates/ra_syntax/test_data/parser/ok/0044_let_attrs.rast b/crates/ra_syntax/test_data/parser/ok/0044_let_attrs.rast
index 6d941487b..c9e6d88eb 100644
--- a/crates/ra_syntax/test_data/parser/ok/0044_let_attrs.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0044_let_attrs.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..165
+  [email protected]
     [email protected] "// https://github.com ..."
     [email protected] "\n"
     [email protected] "fn"
diff --git a/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast b/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast
index 69aa0ba4d..5ebc53618 100644
--- a/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..461
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -101,7 +101,7 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      FN_DEF@544..683
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rast b/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rast
index 38e44e48a..7a54fa113 100644
--- a/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rast
@@ -1,7 +1,7 @@
 [email protected]
   [email protected] "// https://github.com ..."
   [email protected] "\n\n"
-  FN_DEF@62..341
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -256,21 +256,21 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n\n"
-  ENUM_DEF@343..367
+  [email protected]
     [email protected] "enum"
     [email protected] " "
     [email protected]
       [email protected] "A"
     [email protected] " "
-    ENUM_[email protected]
+    [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      ENUM_[email protected]
+      [email protected]
         [email protected]
           [email protected] "B"
-        TUPLE_FIELD_DEF_[email protected]
+        [email protected]
           [email protected] "("
-          TUPLE_FIELD_DEF@358..360
+          [email protected]
             [email protected]
               [email protected]
                 [email protected]
@@ -278,7 +278,7 @@ [email protected]
                     [email protected] "i8"
           [email protected] ","
           [email protected] " "
-          TUPLE_FIELD_DEF@362..364
+          [email protected]
             [email protected]
               [email protected]
                 [email protected]
@@ -288,7 +288,7 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@369..394
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0048_compound_assignment.rast b/crates/ra_syntax/test_data/parser/ok/0048_compound_assignment.rast
index 28233c5d0..662576e5f 100644
--- a/crates/ra_syntax/test_data/parser/ok/0048_compound_assignment.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0048_compound_assignment.rast
@@ -1,7 +1,7 @@
 [email protected]
   [email protected] "// https://github.com ..."
   [email protected] "\n\n"
-  FN_DEF@60..256
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0049_async_block.rast b/crates/ra_syntax/test_data/parser/ok/0049_async_block.rast
index 0569488f8..57ecad3cf 100644
--- a/crates/ra_syntax/test_data/parser/ok/0049_async_block.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0049_async_block.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..45
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rast b/crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rast
index 7847da085..798e81ca6 100644
--- a/crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..52
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -52,7 +52,7 @@ [email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@54..94
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [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 919c690de..8081eefbc 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
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..37
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -41,7 +41,7 @@ [email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n"
-  FN_DEF@38..62
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -83,7 +83,7 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] " "
-      FN_DEF@77..126
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -132,12 +132,12 @@ [email protected]
       [email protected] " "
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@130..172
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
       [email protected] "foo"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected]
@@ -195,7 +195,7 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      FN_DEF@190..234
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -263,7 +263,7 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] "\n     "
-      FN_DEF@252..277
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -287,7 +287,7 @@ [email protected]
           [email protected] "{"
           [email protected] "}"
       [email protected] "\n     "
-      FN_DEF@283..305
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -311,7 +311,7 @@ [email protected]
           [email protected] "{"
           [email protected] "}"
       [email protected] "\n     "
-      FN_DEF@311..334
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -336,12 +336,12 @@ [email protected]
           [email protected] "{"
           [email protected] "}"
       [email protected] "\n     "
-      FN_DEF@340..371
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
           [email protected] "g3"
-        TYP[email protected]
+        GENERIC[email protected]
           [email protected] "<"
           [email protected]
             [email protected] "\'a"
@@ -368,12 +368,12 @@ [email protected]
           [email protected] "{"
           [email protected] "}"
       [email protected] "\n     "
-      FN_DEF@377..407
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
           [email protected] "g4"
-        TYP[email protected]
+        GENERIC[email protected]
           [email protected] "<"
           [email protected]
             [email protected] "\'a"
@@ -400,12 +400,12 @@ [email protected]
           [email protected] "{"
           [email protected] "}"
       [email protected] "\n     "
-      FN_DEF@413..447
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
           [email protected] "g5"
-        TYP[email protected]
+        GENERIC[email protected]
           [email protected] "<"
           [email protected]
             [email protected] "\'a"
@@ -434,7 +434,7 @@ [email protected]
           [email protected] "{"
           [email protected] "}"
       [email protected] "\n     "
-      FN_DEF@453..480
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -465,7 +465,7 @@ [email protected]
           [email protected] "{"
           [email protected] "}"
       [email protected] "\n     "
-      FN_DEF@486..517
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0052_for_range_block.rast b/crates/ra_syntax/test_data/parser/ok/0052_for_range_block.rast
index 65cfa7bc5..a30000398 100644
--- a/crates/ra_syntax/test_data/parser/ok/0052_for_range_block.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0052_for_range_block.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..79
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [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 d6aec7ab9..e3997ac5b 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
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..26
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -35,7 +35,7 @@ [email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@28..56
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -77,7 +77,7 @@ [email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@58..87
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0055_dot_dot_dot.rast b/crates/ra_syntax/test_data/parser/ok/0055_dot_dot_dot.rast
index 9e0cec35f..7447d516e 100644
--- a/crates/ra_syntax/test_data/parser/ok/0055_dot_dot_dot.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0055_dot_dot_dot.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..12
+  [email protected]
     [email protected] "type"
     [email protected] " "
     [email protected]
@@ -12,7 +12,7 @@ [email protected]
       [email protected] ")"
     [email protected] ";"
   [email protected] "\n\n"
-  FN_DEF@14..48
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0056_neq_in_type.rast b/crates/ra_syntax/test_data/parser/ok/0056_neq_in_type.rast
index 7fa3033ac..3ef916e55 100644
--- a/crates/ra_syntax/test_data/parser/ok/0056_neq_in_type.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0056_neq_in_type.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..70
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0057_loop_in_call.rast b/crates/ra_syntax/test_data/parser/ok/0057_loop_in_call.rast
index d93968016..53410a1ee 100644
--- a/crates/ra_syntax/test_data/parser/ok/0057_loop_in_call.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0057_loop_in_call.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..17
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -23,7 +23,7 @@ [email protected]
       [email protected] "{"
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@19..50
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0058_unary_expr_precedence.rast b/crates/ra_syntax/test_data/parser/ok/0058_unary_expr_precedence.rast
index b5c72ee36..a1dfd58f2 100644
--- a/crates/ra_syntax/test_data/parser/ok/0058_unary_expr_precedence.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0058_unary_expr_precedence.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..78
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0059_loops_in_parens.rast b/crates/ra_syntax/test_data/parser/ok/0059_loops_in_parens.rast
index ddcb139c1..767b516a2 100644
--- a/crates/ra_syntax/test_data/parser/ok/0059_loops_in_parens.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0059_loops_in_parens.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..104
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0060_as_range.rast b/crates/ra_syntax/test_data/parser/ok/0060_as_range.rast
index 098152fc3..1fd1a2888 100644
--- a/crates/ra_syntax/test_data/parser/ok/0060_as_range.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0060_as_range.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..55
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0061_match_full_range.rast b/crates/ra_syntax/test_data/parser/ok/0061_match_full_range.rast
index c6e982976..ba49c115b 100644
--- a/crates/ra_syntax/test_data/parser/ok/0061_match_full_range.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0061_match_full_range.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..34
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0062_macro_2.0.rast b/crates/ra_syntax/test_data/parser/ok/0062_macro_2.0.rast
index bf791ee2b..0c22c31a4 100644
--- a/crates/ra_syntax/test_data/parser/ok/0062_macro_2.0.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0062_macro_2.0.rast
@@ -51,7 +51,7 @@ [email protected]
         [email protected] "\n"
         [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@95..348
+  [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 40619b46e..a87bbf4eb 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
@@ -8,7 +8,7 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      FN_DEF@14..46
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -50,7 +50,7 @@ [email protected]
           [email protected] "{"
           [email protected] "}"
       [email protected] "\n    "
-      FN_DEF@51..74
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -92,7 +92,7 @@ [email protected]
           [email protected] "{"
           [email protected] "}"
       [email protected] "\n    "
-      FN_DEF@79..108
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -123,7 +123,7 @@ [email protected]
           [email protected] "{"
           [email protected] "}"
       [email protected] "\n    "
-      FN_DEF@113..135
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -155,7 +155,7 @@ [email protected]
           [email protected] "{"
           [email protected] "}"
       [email protected] "\n    "
-      FN_DEF@140..167
+      [email protected]
         [email protected] "fn"
         [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 5a9f07c89..7adedb02e 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
@@ -8,7 +8,7 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      FN_DEF@17..40
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -37,7 +37,7 @@ [email protected]
           [email protected] ")"
         [email protected] ";"
       [email protected] "\n    "
-      FN_DEF@45..70
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -69,7 +69,7 @@ [email protected]
           [email protected] ")"
         [email protected] ";"
       [email protected] "\n    "
-      FN_DEF@75..123
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [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 7b026e33b..ef0eca47c 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
@@ -11,7 +11,7 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] "\n    "
-      FN_DEF@13..45
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -53,7 +53,7 @@ [email protected]
           [email protected] "{"
           [email protected] "}"
       [email protected] "\n    "
-      FN_DEF@50..73
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -95,7 +95,7 @@ [email protected]
           [email protected] "{"
           [email protected] "}"
       [email protected] "\n    "
-      FN_DEF@78..107
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -126,7 +126,7 @@ [email protected]
           [email protected] "{"
           [email protected] "}"
       [email protected] "\n    "
-      FN_DEF@112..134
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0065_comment_newline.rast b/crates/ra_syntax/test_data/parser/ok/0065_comment_newline.rast
index d1fffdd63..29bd38c05 100644
--- a/crates/ra_syntax/test_data/parser/ok/0065_comment_newline.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0065_comment_newline.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..25
+  [email protected]
     [email protected] "/// Example"
     [email protected] "\n\n"
     [email protected] "fn"
diff --git a/crates/ra_syntax/test_data/parser/ok/0065_plus_after_fn_trait_bound.rast b/crates/ra_syntax/test_data/parser/ok/0065_plus_after_fn_trait_bound.rast
index eb2f8eb3c..2c699ffcb 100644
--- a/crates/ra_syntax/test_data/parser/ok/0065_plus_after_fn_trait_bound.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0065_plus_after_fn_trait_bound.rast
@@ -1,10 +1,10 @@
 [email protected]
-  FN_DEF@0..39
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
       [email protected] "f"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0066_default_const.rast b/crates/ra_syntax/test_data/parser/ok/0066_default_const.rast
index 584b2faf1..485efe20c 100644
--- a/crates/ra_syntax/test_data/parser/ok/0066_default_const.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0066_default_const.rast
@@ -19,7 +19,7 @@ [email protected]
     [email protected]
       [email protected] "{"
       [email protected] "\n  "
-      CONST_DEF@19..43
+      [email protected]
         [email protected] "default"
         [email protected] " "
         [email protected] "const"
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 503585103..a368ac1e8 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
@@ -1,10 +1,10 @@
 [email protected]
-  FN_DEF@0..55
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
       [email protected] "for_trait"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected]
@@ -19,7 +19,7 @@ [email protected]
       [email protected] "\n    "
       [email protected]
         [email protected] "for"
-        TYP[email protected]
+        GENERIC[email protected]
           [email protected] "<"
           [email protected]
             [email protected] "\'a"
@@ -59,12 +59,12 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n"
-  FN_DEF@56..107
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
       [email protected] "for_ref"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected]
@@ -79,7 +79,7 @@ [email protected]
       [email protected] "\n    "
       [email protected]
         [email protected] "for"
-        TYP[email protected]
+        GENERIC[email protected]
           [email protected] "<"
           [email protected]
             [email protected] "\'a"
@@ -110,12 +110,12 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n"
-  FN_DEF@108..170
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
       [email protected] "for_parens"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected]
@@ -130,7 +130,7 @@ [email protected]
       [email protected] "\n    "
       [email protected]
         [email protected] "for"
-        TYP[email protected]
+        GENERIC[email protected]
           [email protected] "<"
           [email protected]
             [email protected] "\'a"
@@ -177,12 +177,12 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n"
-  FN_DEF@171..223
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
       [email protected] "for_slice"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected]
@@ -197,7 +197,7 @@ [email protected]
       [email protected] "\n    "
       [email protected]
         [email protected] "for"
-        TYP[email protected]
+        GENERIC[email protected]
           [email protected] "<"
           [email protected]
             [email protected] "\'a"
@@ -231,12 +231,12 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n"
-  FN_DEF@224..300
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
       [email protected] "for_qpath"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected]
@@ -264,7 +264,7 @@ [email protected]
       [email protected] "\n    "
       [email protected]
         [email protected] "for"
-        TYP[email protected]
+        GENERIC[email protected]
           [email protected] "<"
           [email protected]
             [email protected] "\'a"
@@ -313,12 +313,12 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n"
-  FN_DEF@301..373
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
       [email protected] "for_for_fn"
-    TYP[email protected]
+    GENERIC[email protected]
       [email protected] "<"
       [email protected]
         [email protected]
@@ -333,7 +333,7 @@ [email protected]
       [email protected] "\n    "
       [email protected]
         [email protected] "for"
-        TYP[email protected]
+        GENERIC[email protected]
           [email protected] "<"
           [email protected]
             [email protected] "\'a"
@@ -341,7 +341,7 @@ [email protected]
         [email protected] " "
         [email protected]
           [email protected] "for"
-          TYP[email protected]
+          GENERIC[email protected]
             [email protected] "<"
             [email protected]
               [email protected] "\'b"