199 files changed, 511 insertions, 508 deletions

diff --git a/crates/ra_syntax/src/ast/edit.rs b/crates/ra_syntax/src/ast/edit.rs
index 6ebe10ff6..4a67fd44a 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()
diff --git a/crates/ra_syntax/src/ast/expr_ext.rs b/crates/ra_syntax/src/ast/expr_ext.rs
index 69c85c809..8692b9bb5 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)
     }
 }
 
diff --git a/crates/ra_syntax/src/ast/generated/nodes.rs b/crates/ra_syntax/src/ast/generated/nodes.rs
index be657699f..4fc35585d 100644
--- a/crates/ra_syntax/src/ast/generated/nodes.rs
+++ b/crates/ra_syntax/src/ast/generated/nodes.rs
@@ -79,19 +79,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::TypeParamsOwner 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) }
@@ -303,7 +303,9 @@ 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(crate) syntax: SyntaxNode,
@@ -321,8 +323,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,6 +358,32 @@ impl BlockExpr {
     pub fn r_curly_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 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 RecordFieldDefList {
     pub(crate) syntax: SyntaxNode,
 }
@@ -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,
 }
@@ -1274,7 +1277,7 @@ pub enum Item {
     EnumDef(EnumDef),
     ExternBlock(ExternBlock),
     ExternCrate(ExternCrate),
-    FnDef(FnDef),
+    Fn(Fn),
     ImplDef(ImplDef),
     MacroCall(MacroCall),
     Module(Module),
@@ -1303,6 +1306,24 @@ pub enum TypeRef {
     DynTraitType(DynTraitType),
 }
 #[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 FieldDefList {
     RecordFieldDefList(RecordFieldDefList),
     TupleFieldDefList(TupleFieldDefList),
@@ -1343,7 +1364,7 @@ pub enum Expr {
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub enum AssocItem {
-    FnDef(FnDef),
+    Fn(Fn),
     TypeAliasDef(TypeAliasDef),
     ConstDef(ConstDef),
     MacroCall(MacroCall),
@@ -1351,24 +1372,6 @@ pub enum AssocItem {
 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,7 +1384,7 @@ pub enum AttrInput {
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub enum ExternItem {
-    FnDef(FnDef),
+    Fn(Fn),
     StaticDef(StaticDef),
 }
 impl ast::AttrsOwner for ExternItem {}
@@ -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 })
@@ -1727,6 +1730,28 @@ impl AstNode for BlockExpr {
     }
     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 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 RecordFieldDefList {
     fn can_cast(kind: SyntaxKind) -> bool { kind == RECORD_FIELD_DEF_LIST }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
@@ -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> {
@@ -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) }
@@ -2817,7 +2820,7 @@ 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
+            CONST_DEF | ENUM_DEF | EXTERN_BLOCK | EXTERN_CRATE | FN | IMPL_DEF | MACRO_CALL
             | MODULE | STATIC_DEF | STRUCT_DEF | TRAIT_DEF | TYPE_ALIAS_DEF | UNION_DEF | USE => {
                 true
             }
@@ -2830,7 +2833,7 @@ impl AstNode for Item {
             ENUM_DEF => Item::EnumDef(EnumDef { 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 }),
@@ -2850,7 +2853,7 @@ impl AstNode for Item {
             Item::EnumDef(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,
@@ -2948,6 +2951,101 @@ impl AstNode for TypeRef {
         }
     }
 }
+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<RecordFieldDefList> for FieldDefList {
     fn from(node: RecordFieldDefList) -> FieldDefList { FieldDefList::RecordFieldDefList(node) }
 }
@@ -3157,8 +3255,8 @@ 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) }
@@ -3172,13 +3270,13 @@ 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_DEF | CONST_DEF | MACRO_CALL => true,
             _ => false,
         }
     }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         let res = match syntax.kind() {
-            FN_DEF => AssocItem::FnDef(FnDef { syntax }),
+            FN => AssocItem::Fn(Fn { syntax }),
             TYPE_ALIAS_DEF => AssocItem::TypeAliasDef(TypeAliasDef { syntax }),
             CONST_DEF => AssocItem::ConstDef(ConstDef { syntax }),
             MACRO_CALL => AssocItem::MacroCall(MacroCall { syntax }),
@@ -3188,108 +3286,13 @@ impl AstNode for AssocItem {
     }
     fn syntax(&self) -> &SyntaxNode {
         match self {
-            AssocItem::FnDef(it) => &it.syntax,
+            AssocItem::Fn(it) => &it.syntax,
             AssocItem::TypeAliasDef(it) => &it.syntax,
             AssocItem::ConstDef(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,8 +3349,8 @@ 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) }
@@ -3355,13 +3358,13 @@ impl From<StaticDef> for ExternItem {
 impl AstNode for ExternItem {
     fn can_cast(kind: SyntaxKind) -> bool {
         match kind {
-            FN_DEF | STATIC_DEF => true,
+            FN | STATIC_DEF => true,
             _ => false,
         }
     }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         let res = match syntax.kind() {
-            FN_DEF => ExternItem::FnDef(FnDef { syntax }),
+            FN => ExternItem::Fn(Fn { syntax }),
             STATIC_DEF => ExternItem::StaticDef(StaticDef { syntax }),
             _ => return None,
         };
@@ -3369,7 +3372,7 @@ impl AstNode for ExternItem {
     }
     fn syntax(&self) -> &SyntaxNode {
         match self {
-            ExternItem::FnDef(it) => &it.syntax,
+            ExternItem::Fn(it) => &it.syntax,
             ExternItem::StaticDef(it) => &it.syntax,
         }
     }
@@ -3417,22 +3420,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 FieldDefList {
     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)
     }
@@ -3487,7 +3490,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)
     }
@@ -3607,6 +3610,16 @@ impl std::fmt::Display for BlockExpr {
         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 SelfParam {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        std::fmt::Display::fmt(self.syntax(), f)
+    }
+}
 impl std::fmt::Display for RecordFieldDefList {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
@@ -4037,16 +4050,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..ef235680f 100644
--- a/crates/ra_syntax/src/ast/make.rs
+++ b/crates/ra_syntax/src/ast/make.rs
@@ -294,7 +294,7 @@ pub fn fn_def(
     type_params: Option<ast::TypeParamList>,
     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..9fb6b7268 100644
--- a/crates/ra_syntax/src/ast/node_ext.rs
+++ b/crates/ra_syntax/src/ast/node_ext.rs
@@ -474,7 +474,7 @@ impl ast::TokenTree {
 }
 
 impl ast::DocCommentsOwner for ast::SourceFile {}
-impl ast::DocCommentsOwner for ast::FnDef {}
+impl ast::DocCommentsOwner for ast::Fn {}
 impl ast::DocCommentsOwner for ast::StructDef {}
 impl ast::DocCommentsOwner for ast::UnionDef {}
 impl ast::DocCommentsOwner for ast::RecordFieldDef {}
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..2a0f95d15 100644
--- a/crates/ra_syntax/src/parsing/text_tree_sink.rs
+++ b/crates/ra_syntax/src/parsing/text_tree_sink.rs
@@ -146,7 +146,7 @@ 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
+        MACRO_CALL | CONST_DEF | TYPE_ALIAS_DEF | STRUCT_DEF | ENUM_DEF | ENUM_VARIANT | FN
         | TRAIT_DEF | MODULE | RECORD_FIELD_DEF | STATIC_DEF => {
             let mut res = 0;
             let mut trivias = trivias.enumerate().peekable();
diff --git a/crates/ra_syntax/src/validation.rs b/crates/ra_syntax/src/validation.rs
index fdec48fb0..2714d102a 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_DEF, FN, INT_NUMBER, STRING, TYPE_ALIAS_DEF},
     SyntaxNode, SyntaxToken, TextSize, T,
 };
 use rustc_lexer::unescape::{
@@ -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_DEF | TYPE_ALIAS_DEF => (),
         _ => 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/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/0007_stray_curly_in_file.rast b/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast
index b72c92c33..2ae5bacea 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
@@ -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/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/0012_broken_lambda.rast b/crates/ra_syntax/test_data/parser/err/0012_broken_lambda.rast
index e1e782f5f..c8bf96550 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]
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..1ab045a44 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,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/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..ce43ddf45 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]
@@ -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..866f61113 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]
@@ -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..1e94e72bc 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,5 +1,5 @@
 [email protected]
-  FN_DEF@0..53
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -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]
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..4b9bd679e 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]
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..53704f640 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]
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..f180616f1 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] " "
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/0044_unexpected_for_type.rast b/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast
index cb90f28bc..5f59c3bc2 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
@@ -136,7 +136,7 @@ [email protected]
             [email protected] ")"
     [email protected] ";"
   [email protected] "\n"
-  FN_DEF@150..238
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
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/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/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..d2a18330f 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"
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..b31195281 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
@@ -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..6753c3fe7 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]
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..7847ba65a 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
@@ -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..9cae1e8cc 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,5 +1,5 @@
 [email protected]
-  FN_DEF@0..53
+  [email protected]
     [email protected] "fn"
     [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..1b56e20d5 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,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/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/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/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/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..daa55ec6c 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
@@ -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/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/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/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/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..8f6cd2e2f 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
@@ -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/0040_crate_keyword_vis.rast b/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rast
index aa582516a..47cbe7c1f 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] " "
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..fbf2e7c67 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,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/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/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/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..b0aa73b7d 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]
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..f6417ab13 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]
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/0066_match_arm.rast b/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rast
index 177bb5514..d2279877b 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]
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..d6926425c 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]
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/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..cfa4c05f5 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,5 +1,5 @@
 [email protected]
-  FN_DEF@0..28
+  [email protected]
     [email protected] "fn"
     [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/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/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/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/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/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/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..f4008cfdc 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,5 +1,5 @@
 [email protected]
-  FN_DEF@0..63
+  [email protected]
     [email protected] "fn"
     [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..20979cef3 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]
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/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..9fc724f3f 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
@@ -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..ceae8a4ec 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]
@@ -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]
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..1ad03e005 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,5 +1,5 @@
 [email protected]
-  FN_DEF@0..58
+  [email protected]
     [email protected] "fn"
     [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..a03139ab5 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]
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/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/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/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/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..ea26f1440 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]
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/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/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/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..1b2325a2d 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,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/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..2e36b54bc 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]
@@ -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..a5f09e364 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] " "
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/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..4f0c68822 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
@@ -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..22eb22e3c 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
@@ -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]
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..29a5d48e6 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]
@@ -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..9a173b002 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,7 +132,7 @@ [email protected]
       [email protected] " "
       [email protected] "}"
   [email protected] "\n\n"
-  FN_DEF@130..172
+  [email protected]
     [email protected] "fn"
     [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,7 +336,7 @@ [email protected]
           [email protected] "{"
           [email protected] "}"
       [email protected] "\n     "
-      FN_DEF@340..371
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -368,7 +368,7 @@ [email protected]
           [email protected] "{"
           [email protected] "}"
       [email protected] "\n     "
-      FN_DEF@377..407
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -400,7 +400,7 @@ [email protected]
           [email protected] "{"
           [email protected] "}"
       [email protected] "\n     "
-      FN_DEF@413..447
+      [email protected]
         [email protected] "fn"
         [email protected] " "
         [email protected]
@@ -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..1c893180c 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
@@ -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..7996dc121 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,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/ok/0067_where_for_pred.rast b/crates/ra_syntax/test_data/parser/ok/0067_where_for_pred.rast
index 503585103..e4c2578f6 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,5 +1,5 @@
 [email protected]
-  FN_DEF@0..55
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -59,7 +59,7 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n"
-  FN_DEF@56..107
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -110,7 +110,7 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n"
-  FN_DEF@108..170
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -177,7 +177,7 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n"
-  FN_DEF@171..223
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -231,7 +231,7 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n"
-  FN_DEF@224..300
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -313,7 +313,7 @@ [email protected]
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n"
-  FN_DEF@301..373
+  [email protected]
     [email protected] "fn"
     [email protected] " "
     [email protected]