Merge #1731

1731: rename pos_field -> tuple_field r=matklad a=matklad



Co-authored-by: Aleksey Kladov <[email protected]>

43 files changed, 421 insertions, 421 deletions

diff --git a/crates/ra_syntax/src/ast/expr_extensions.rs b/crates/ra_syntax/src/ast/expr_extensions.rs
index cf5b6f251..d7ea4354d 100644
--- a/crates/ra_syntax/src/ast/expr_extensions.rs
+++ b/crates/ra_syntax/src/ast/expr_extensions.rs
@@ -296,8 +296,8 @@ fn test_literal_with_attr() {
     assert_eq!(lit.token().text(), r#""Hello""#);
 }
 
-impl ast::NamedField {
-    pub fn parent_struct_lit(&self) -> ast::StructLit {
-        self.syntax().ancestors().find_map(ast::StructLit::cast).unwrap()
+impl ast::RecordField {
+    pub fn parent_record_lit(&self) -> ast::RecordLit {
+        self.syntax().ancestors().find_map(ast::RecordLit::cast).unwrap()
     }
 }
diff --git a/crates/ra_syntax/src/ast/extensions.rs b/crates/ra_syntax/src/ast/extensions.rs
index e0ea3e5ab..d3a375f87 100644
--- a/crates/ra_syntax/src/ast/extensions.rs
+++ b/crates/ra_syntax/src/ast/extensions.rs
@@ -195,16 +195,16 @@ impl ast::ImplBlock {
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum StructKind {
-    Tuple(ast::PosFieldDefList),
-    Named(ast::NamedFieldDefList),
+    Tuple(ast::TupleFieldDefList),
+    Named(ast::RecordFieldDefList),
     Unit,
 }
 
 impl StructKind {
     fn from_node<N: AstNode>(node: &N) -> StructKind {
-        if let Some(nfdl) = child_opt::<_, ast::NamedFieldDefList>(node) {
+        if let Some(nfdl) = child_opt::<_, ast::RecordFieldDefList>(node) {
             StructKind::Named(nfdl)
-        } else if let Some(pfl) = child_opt::<_, ast::PosFieldDefList>(node) {
+        } else if let Some(pfl) = child_opt::<_, ast::TupleFieldDefList>(node) {
             StructKind::Tuple(pfl)
         } else {
             StructKind::Unit
diff --git a/crates/ra_syntax/src/ast/generated.rs b/crates/ra_syntax/src/ast/generated.rs
index 9c5789701..07cc3e0db 100644
--- a/crates/ra_syntax/src/ast/generated.rs
+++ b/crates/ra_syntax/src/ast/generated.rs
@@ -607,7 +607,7 @@ pub enum Expr {
     BlockExpr(BlockExpr),
     ReturnExpr(ReturnExpr),
     MatchExpr(MatchExpr),
-    StructLit(StructLit),
+    RecordLit(RecordLit),
     CallExpr(CallExpr),
     IndexExpr(IndexExpr),
     MethodCallExpr(MethodCallExpr),
@@ -698,9 +698,9 @@ impl From<MatchExpr> for Expr {
         Expr::MatchExpr(node)
     }
 }
-impl From<StructLit> for Expr {
-    fn from(node: StructLit) -> Expr {
-        Expr::StructLit(node)
+impl From<RecordLit> for Expr {
+    fn from(node: RecordLit) -> Expr {
+        Expr::RecordLit(node)
     }
 }
 impl From<CallExpr> for Expr {
@@ -778,7 +778,7 @@ impl AstNode for Expr {
         match kind {
             TUPLE_EXPR | ARRAY_EXPR | PAREN_EXPR | PATH_EXPR | LAMBDA_EXPR | IF_EXPR
             | LOOP_EXPR | FOR_EXPR | WHILE_EXPR | CONTINUE_EXPR | BREAK_EXPR | LABEL
-            | BLOCK_EXPR | RETURN_EXPR | MATCH_EXPR | STRUCT_LIT | CALL_EXPR | INDEX_EXPR
+            | BLOCK_EXPR | RETURN_EXPR | MATCH_EXPR | RECORD_LIT | CALL_EXPR | INDEX_EXPR
             | METHOD_CALL_EXPR | FIELD_EXPR | AWAIT_EXPR | TRY_EXPR | TRY_BLOCK_EXPR
             | CAST_EXPR | REF_EXPR | PREFIX_EXPR | RANGE_EXPR | BIN_EXPR | LITERAL | MACRO_CALL => {
                 true
@@ -803,7 +803,7 @@ impl AstNode for Expr {
             BLOCK_EXPR => Expr::BlockExpr(BlockExpr { syntax }),
             RETURN_EXPR => Expr::ReturnExpr(ReturnExpr { syntax }),
             MATCH_EXPR => Expr::MatchExpr(MatchExpr { syntax }),
-            STRUCT_LIT => Expr::StructLit(StructLit { syntax }),
+            RECORD_LIT => Expr::RecordLit(RecordLit { syntax }),
             CALL_EXPR => Expr::CallExpr(CallExpr { syntax }),
             INDEX_EXPR => Expr::IndexExpr(IndexExpr { syntax }),
             METHOD_CALL_EXPR => Expr::MethodCallExpr(MethodCallExpr { syntax }),
@@ -839,7 +839,7 @@ impl AstNode for Expr {
             Expr::BlockExpr(it) => &it.syntax,
             Expr::ReturnExpr(it) => &it.syntax,
             Expr::MatchExpr(it) => &it.syntax,
-            Expr::StructLit(it) => &it.syntax,
+            Expr::RecordLit(it) => &it.syntax,
             Expr::CallExpr(it) => &it.syntax,
             Expr::IndexExpr(it) => &it.syntax,
             Expr::MethodCallExpr(it) => &it.syntax,
@@ -946,64 +946,6 @@ impl FieldExpr {
     }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct FieldPat {
-    pub(crate) syntax: SyntaxNode,
-}
-impl AstNode for FieldPat {
-    fn can_cast(kind: SyntaxKind) -> bool {
-        match kind {
-            FIELD_PAT => true,
-            _ => false,
-        }
-    }
-    fn cast(syntax: SyntaxNode) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxNode {
-        &self.syntax
-    }
-}
-impl ast::NameOwner for FieldPat {}
-impl FieldPat {
-    pub fn pat(&self) -> Option<Pat> {
-        AstChildren::new(&self.syntax).next()
-    }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct FieldPatList {
-    pub(crate) syntax: SyntaxNode,
-}
-impl AstNode for FieldPatList {
-    fn can_cast(kind: SyntaxKind) -> bool {
-        match kind {
-            FIELD_PAT_LIST => true,
-            _ => false,
-        }
-    }
-    fn cast(syntax: SyntaxNode) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxNode {
-        &self.syntax
-    }
-}
-impl FieldPatList {
-    pub fn field_pats(&self) -> AstChildren<FieldPat> {
-        AstChildren::new(&self.syntax)
-    }
-    pub fn bind_pats(&self) -> AstChildren<BindPat> {
-        AstChildren::new(&self.syntax)
-    }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct FnDef {
     pub(crate) syntax: SyntaxNode,
 }
@@ -1942,121 +1884,6 @@ impl AstNode for NameRef {
 }
 impl NameRef {}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct NamedField {
-    pub(crate) syntax: SyntaxNode,
-}
-impl AstNode for NamedField {
-    fn can_cast(kind: SyntaxKind) -> bool {
-        match kind {
-            NAMED_FIELD => true,
-            _ => false,
-        }
-    }
-    fn cast(syntax: SyntaxNode) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxNode {
-        &self.syntax
-    }
-}
-impl NamedField {
-    pub fn name_ref(&self) -> Option<NameRef> {
-        AstChildren::new(&self.syntax).next()
-    }
-    pub fn expr(&self) -> Option<Expr> {
-        AstChildren::new(&self.syntax).next()
-    }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct NamedFieldDef {
-    pub(crate) syntax: SyntaxNode,
-}
-impl AstNode for NamedFieldDef {
-    fn can_cast(kind: SyntaxKind) -> bool {
-        match kind {
-            NAMED_FIELD_DEF => true,
-            _ => false,
-        }
-    }
-    fn cast(syntax: SyntaxNode) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxNode {
-        &self.syntax
-    }
-}
-impl ast::VisibilityOwner for NamedFieldDef {}
-impl ast::NameOwner for NamedFieldDef {}
-impl ast::AttrsOwner for NamedFieldDef {}
-impl ast::DocCommentsOwner for NamedFieldDef {}
-impl ast::TypeAscriptionOwner for NamedFieldDef {}
-impl NamedFieldDef {}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct NamedFieldDefList {
-    pub(crate) syntax: SyntaxNode,
-}
-impl AstNode for NamedFieldDefList {
-    fn can_cast(kind: SyntaxKind) -> bool {
-        match kind {
-            NAMED_FIELD_DEF_LIST => true,
-            _ => false,
-        }
-    }
-    fn cast(syntax: SyntaxNode) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxNode {
-        &self.syntax
-    }
-}
-impl NamedFieldDefList {
-    pub fn fields(&self) -> AstChildren<NamedFieldDef> {
-        AstChildren::new(&self.syntax)
-    }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct NamedFieldList {
-    pub(crate) syntax: SyntaxNode,
-}
-impl AstNode for NamedFieldList {
-    fn can_cast(kind: SyntaxKind) -> bool {
-        match kind {
-            NAMED_FIELD_LIST => true,
-            _ => false,
-        }
-    }
-    fn cast(syntax: SyntaxNode) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxNode {
-        &self.syntax
-    }
-}
-impl NamedFieldList {
-    pub fn fields(&self) -> AstChildren<NamedField> {
-        AstChildren::new(&self.syntax)
-    }
-    pub fn spread(&self) -> Option<Expr> {
-        AstChildren::new(&self.syntax).next()
-    }
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct NeverType {
     pub(crate) syntax: SyntaxNode,
 }
@@ -2239,7 +2066,7 @@ pub enum Pat {
     BindPat(BindPat),
     PlaceholderPat(PlaceholderPat),
     PathPat(PathPat),
-    StructPat(StructPat),
+    RecordPat(RecordPat),
     TupleStructPat(TupleStructPat),
     TuplePat(TuplePat),
     SlicePat(SlicePat),
@@ -2266,9 +2093,9 @@ impl From<PathPat> for Pat {
         Pat::PathPat(node)
     }
 }
-impl From<StructPat> for Pat {
-    fn from(node: StructPat) -> Pat {
-        Pat::StructPat(node)
+impl From<RecordPat> for Pat {
+    fn from(node: RecordPat) -> Pat {
+        Pat::RecordPat(node)
     }
 }
 impl From<TupleStructPat> for Pat {
@@ -2299,7 +2126,7 @@ impl From<LiteralPat> for Pat {
 impl AstNode for Pat {
     fn can_cast(kind: SyntaxKind) -> bool {
         match kind {
-            REF_PAT | BIND_PAT | PLACEHOLDER_PAT | PATH_PAT | STRUCT_PAT | TUPLE_STRUCT_PAT
+            REF_PAT | BIND_PAT | PLACEHOLDER_PAT | PATH_PAT | RECORD_PAT | TUPLE_STRUCT_PAT
             | TUPLE_PAT | SLICE_PAT | RANGE_PAT | LITERAL_PAT => true,
             _ => false,
         }
@@ -2310,7 +2137,7 @@ impl AstNode for Pat {
             BIND_PAT => Pat::BindPat(BindPat { syntax }),
             PLACEHOLDER_PAT => Pat::PlaceholderPat(PlaceholderPat { syntax }),
             PATH_PAT => Pat::PathPat(PathPat { syntax }),
-            STRUCT_PAT => Pat::StructPat(StructPat { 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 }),
@@ -2326,7 +2153,7 @@ impl AstNode for Pat {
             Pat::BindPat(it) => &it.syntax,
             Pat::PlaceholderPat(it) => &it.syntax,
             Pat::PathPat(it) => &it.syntax,
-            Pat::StructPat(it) => &it.syntax,
+            Pat::RecordPat(it) => &it.syntax,
             Pat::TupleStructPat(it) => &it.syntax,
             Pat::TuplePat(it) => &it.syntax,
             Pat::SlicePat(it) => &it.syntax,
@@ -2551,13 +2378,13 @@ impl PointerType {
     }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct PosFieldDef {
+pub struct PrefixExpr {
     pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for PosFieldDef {
+impl AstNode for PrefixExpr {
     fn can_cast(kind: SyntaxKind) -> bool {
         match kind {
-            POS_FIELD_DEF => true,
+            PREFIX_EXPR => true,
             _ => false,
         }
     }
@@ -2572,21 +2399,19 @@ impl AstNode for PosFieldDef {
         &self.syntax
     }
 }
-impl ast::VisibilityOwner for PosFieldDef {}
-impl ast::AttrsOwner for PosFieldDef {}
-impl PosFieldDef {
-    pub fn type_ref(&self) -> Option<TypeRef> {
+impl PrefixExpr {
+    pub fn expr(&self) -> Option<Expr> {
         AstChildren::new(&self.syntax).next()
     }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct PosFieldDefList {
+pub struct RangeExpr {
     pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for PosFieldDefList {
+impl AstNode for RangeExpr {
     fn can_cast(kind: SyntaxKind) -> bool {
         match kind {
-            POS_FIELD_DEF_LIST => true,
+            RANGE_EXPR => true,
             _ => false,
         }
     }
@@ -2601,19 +2426,38 @@ impl AstNode for PosFieldDefList {
         &self.syntax
     }
 }
-impl PosFieldDefList {
-    pub fn fields(&self) -> AstChildren<PosFieldDef> {
-        AstChildren::new(&self.syntax)
+impl RangeExpr {}
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct RangePat {
+    pub(crate) syntax: SyntaxNode,
+}
+impl AstNode for RangePat {
+    fn can_cast(kind: SyntaxKind) -> bool {
+        match kind {
+            RANGE_PAT => true,
+            _ => false,
+        }
+    }
+    fn cast(syntax: SyntaxNode) -> Option<Self> {
+        if Self::can_cast(syntax.kind()) {
+            Some(Self { syntax })
+        } else {
+            None
+        }
+    }
+    fn syntax(&self) -> &SyntaxNode {
+        &self.syntax
     }
 }
+impl RangePat {}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct PrefixExpr {
+pub struct RecordField {
     pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for PrefixExpr {
+impl AstNode for RecordField {
     fn can_cast(kind: SyntaxKind) -> bool {
         match kind {
-            PREFIX_EXPR => true,
+            RECORD_FIELD => true,
             _ => false,
         }
     }
@@ -2628,19 +2472,22 @@ impl AstNode for PrefixExpr {
         &self.syntax
     }
 }
-impl PrefixExpr {
+impl RecordField {
+    pub fn name_ref(&self) -> Option<NameRef> {
+        AstChildren::new(&self.syntax).next()
+    }
     pub fn expr(&self) -> Option<Expr> {
         AstChildren::new(&self.syntax).next()
     }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct RangeExpr {
+pub struct RecordFieldDef {
     pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for RangeExpr {
+impl AstNode for RecordFieldDef {
     fn can_cast(kind: SyntaxKind) -> bool {
         match kind {
-            RANGE_EXPR => true,
+            RECORD_FIELD_DEF => true,
             _ => false,
         }
     }
@@ -2655,15 +2502,20 @@ impl AstNode for RangeExpr {
         &self.syntax
     }
 }
-impl RangeExpr {}
+impl ast::VisibilityOwner for RecordFieldDef {}
+impl ast::NameOwner for RecordFieldDef {}
+impl ast::AttrsOwner for RecordFieldDef {}
+impl ast::DocCommentsOwner for RecordFieldDef {}
+impl ast::TypeAscriptionOwner for RecordFieldDef {}
+impl RecordFieldDef {}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct RangePat {
+pub struct RecordFieldDefList {
     pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for RangePat {
+impl AstNode for RecordFieldDefList {
     fn can_cast(kind: SyntaxKind) -> bool {
         match kind {
-            RANGE_PAT => true,
+            RECORD_FIELD_DEF_LIST => true,
             _ => false,
         }
     }
@@ -2678,7 +2530,159 @@ impl AstNode for RangePat {
         &self.syntax
     }
 }
-impl RangePat {}
+impl RecordFieldDefList {
+    pub fn fields(&self) -> AstChildren<RecordFieldDef> {
+        AstChildren::new(&self.syntax)
+    }
+}
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct RecordFieldList {
+    pub(crate) syntax: SyntaxNode,
+}
+impl AstNode for RecordFieldList {
+    fn can_cast(kind: SyntaxKind) -> bool {
+        match kind {
+            RECORD_FIELD_LIST => true,
+            _ => false,
+        }
+    }
+    fn cast(syntax: SyntaxNode) -> Option<Self> {
+        if Self::can_cast(syntax.kind()) {
+            Some(Self { syntax })
+        } else {
+            None
+        }
+    }
+    fn syntax(&self) -> &SyntaxNode {
+        &self.syntax
+    }
+}
+impl RecordFieldList {
+    pub fn fields(&self) -> AstChildren<RecordField> {
+        AstChildren::new(&self.syntax)
+    }
+    pub fn spread(&self) -> Option<Expr> {
+        AstChildren::new(&self.syntax).next()
+    }
+}
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct RecordFieldPat {
+    pub(crate) syntax: SyntaxNode,
+}
+impl AstNode for RecordFieldPat {
+    fn can_cast(kind: SyntaxKind) -> bool {
+        match kind {
+            RECORD_FIELD_PAT => true,
+            _ => false,
+        }
+    }
+    fn cast(syntax: SyntaxNode) -> Option<Self> {
+        if Self::can_cast(syntax.kind()) {
+            Some(Self { syntax })
+        } else {
+            None
+        }
+    }
+    fn syntax(&self) -> &SyntaxNode {
+        &self.syntax
+    }
+}
+impl ast::NameOwner for RecordFieldPat {}
+impl RecordFieldPat {
+    pub fn pat(&self) -> Option<Pat> {
+        AstChildren::new(&self.syntax).next()
+    }
+}
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct RecordFieldPatList {
+    pub(crate) syntax: SyntaxNode,
+}
+impl AstNode for RecordFieldPatList {
+    fn can_cast(kind: SyntaxKind) -> bool {
+        match kind {
+            RECORD_FIELD_PAT_LIST => true,
+            _ => false,
+        }
+    }
+    fn cast(syntax: SyntaxNode) -> Option<Self> {
+        if Self::can_cast(syntax.kind()) {
+            Some(Self { syntax })
+        } else {
+            None
+        }
+    }
+    fn syntax(&self) -> &SyntaxNode {
+        &self.syntax
+    }
+}
+impl RecordFieldPatList {
+    pub fn record_field_pats(&self) -> AstChildren<RecordFieldPat> {
+        AstChildren::new(&self.syntax)
+    }
+    pub fn bind_pats(&self) -> AstChildren<BindPat> {
+        AstChildren::new(&self.syntax)
+    }
+}
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct RecordLit {
+    pub(crate) syntax: SyntaxNode,
+}
+impl AstNode for RecordLit {
+    fn can_cast(kind: SyntaxKind) -> bool {
+        match kind {
+            RECORD_LIT => true,
+            _ => false,
+        }
+    }
+    fn cast(syntax: SyntaxNode) -> Option<Self> {
+        if Self::can_cast(syntax.kind()) {
+            Some(Self { syntax })
+        } else {
+            None
+        }
+    }
+    fn syntax(&self) -> &SyntaxNode {
+        &self.syntax
+    }
+}
+impl RecordLit {
+    pub fn path(&self) -> Option<Path> {
+        AstChildren::new(&self.syntax).next()
+    }
+    pub fn record_field_list(&self) -> Option<RecordFieldList> {
+        AstChildren::new(&self.syntax).next()
+    }
+}
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct RecordPat {
+    pub(crate) syntax: SyntaxNode,
+}
+impl AstNode for RecordPat {
+    fn can_cast(kind: SyntaxKind) -> bool {
+        match kind {
+            RECORD_PAT => true,
+            _ => false,
+        }
+    }
+    fn cast(syntax: SyntaxNode) -> Option<Self> {
+        if Self::can_cast(syntax.kind()) {
+            Some(Self { syntax })
+        } else {
+            None
+        }
+    }
+    fn syntax(&self) -> &SyntaxNode {
+        &self.syntax
+    }
+}
+impl RecordPat {
+    pub fn record_field_pat_list(&self) -> Option<RecordFieldPatList> {
+        AstChildren::new(&self.syntax).next()
+    }
+    pub fn path(&self) -> Option<Path> {
+        AstChildren::new(&self.syntax).next()
+    }
+}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct RefExpr {
     pub(crate) syntax: SyntaxNode,
@@ -3018,13 +3022,13 @@ impl ast::AttrsOwner for StructDef {}
 impl ast::DocCommentsOwner for StructDef {}
 impl StructDef {}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct StructLit {
+pub struct TokenTree {
     pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for StructLit {
+impl AstNode for TokenTree {
     fn can_cast(kind: SyntaxKind) -> bool {
         match kind {
-            STRUCT_LIT => true,
+            TOKEN_TREE => true,
             _ => false,
         }
     }
@@ -3039,22 +3043,15 @@ impl AstNode for StructLit {
         &self.syntax
     }
 }
-impl StructLit {
-    pub fn path(&self) -> Option<Path> {
-        AstChildren::new(&self.syntax).next()
-    }
-    pub fn named_field_list(&self) -> Option<NamedFieldList> {
-        AstChildren::new(&self.syntax).next()
-    }
-}
+impl TokenTree {}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct StructPat {
+pub struct TraitDef {
     pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for StructPat {
+impl AstNode for TraitDef {
     fn can_cast(kind: SyntaxKind) -> bool {
         match kind {
-            STRUCT_PAT => true,
+            TRAIT_DEF => true,
             _ => false,
         }
     }
@@ -3069,22 +3066,25 @@ impl AstNode for StructPat {
         &self.syntax
     }
 }
-impl StructPat {
-    pub fn field_pat_list(&self) -> Option<FieldPatList> {
-        AstChildren::new(&self.syntax).next()
-    }
-    pub fn path(&self) -> Option<Path> {
+impl ast::VisibilityOwner for TraitDef {}
+impl ast::NameOwner for TraitDef {}
+impl ast::AttrsOwner for TraitDef {}
+impl ast::DocCommentsOwner for TraitDef {}
+impl ast::TypeParamsOwner for TraitDef {}
+impl ast::TypeBoundsOwner for TraitDef {}
+impl TraitDef {
+    pub fn item_list(&self) -> Option<ItemList> {
         AstChildren::new(&self.syntax).next()
     }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct TokenTree {
+pub struct TryBlockExpr {
     pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for TokenTree {
+impl AstNode for TryBlockExpr {
     fn can_cast(kind: SyntaxKind) -> bool {
         match kind {
-            TOKEN_TREE => true,
+            TRY_BLOCK_EXPR => true,
             _ => false,
         }
     }
@@ -3099,15 +3099,16 @@ impl AstNode for TokenTree {
         &self.syntax
     }
 }
-impl TokenTree {}
+impl ast::TryBlockBodyOwner for TryBlockExpr {}
+impl TryBlockExpr {}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct TraitDef {
+pub struct TryExpr {
     pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for TraitDef {
+impl AstNode for TryExpr {
     fn can_cast(kind: SyntaxKind) -> bool {
         match kind {
-            TRAIT_DEF => true,
+            TRY_EXPR => true,
             _ => false,
         }
     }
@@ -3122,25 +3123,19 @@ impl AstNode for TraitDef {
         &self.syntax
     }
 }
-impl ast::VisibilityOwner for TraitDef {}
-impl ast::NameOwner for TraitDef {}
-impl ast::AttrsOwner for TraitDef {}
-impl ast::DocCommentsOwner for TraitDef {}
-impl ast::TypeParamsOwner for TraitDef {}
-impl ast::TypeBoundsOwner for TraitDef {}
-impl TraitDef {
-    pub fn item_list(&self) -> Option<ItemList> {
+impl TryExpr {
+    pub fn expr(&self) -> Option<Expr> {
         AstChildren::new(&self.syntax).next()
     }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct TryBlockExpr {
+pub struct TupleExpr {
     pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for TryBlockExpr {
+impl AstNode for TupleExpr {
     fn can_cast(kind: SyntaxKind) -> bool {
         match kind {
-            TRY_BLOCK_EXPR => true,
+            TUPLE_EXPR => true,
             _ => false,
         }
     }
@@ -3155,16 +3150,19 @@ impl AstNode for TryBlockExpr {
         &self.syntax
     }
 }
-impl ast::TryBlockBodyOwner for TryBlockExpr {}
-impl TryBlockExpr {}
+impl TupleExpr {
+    pub fn exprs(&self) -> AstChildren<Expr> {
+        AstChildren::new(&self.syntax)
+    }
+}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct TryExpr {
+pub struct TupleFieldDef {
     pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for TryExpr {
+impl AstNode for TupleFieldDef {
     fn can_cast(kind: SyntaxKind) -> bool {
         match kind {
-            TRY_EXPR => true,
+            TUPLE_FIELD_DEF => true,
             _ => false,
         }
     }
@@ -3179,19 +3177,21 @@ impl AstNode for TryExpr {
         &self.syntax
     }
 }
-impl TryExpr {
-    pub fn expr(&self) -> Option<Expr> {
+impl ast::VisibilityOwner for TupleFieldDef {}
+impl ast::AttrsOwner for TupleFieldDef {}
+impl TupleFieldDef {
+    pub fn type_ref(&self) -> Option<TypeRef> {
         AstChildren::new(&self.syntax).next()
     }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct TupleExpr {
+pub struct TupleFieldDefList {
     pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for TupleExpr {
+impl AstNode for TupleFieldDefList {
     fn can_cast(kind: SyntaxKind) -> bool {
         match kind {
-            TUPLE_EXPR => true,
+            TUPLE_FIELD_DEF_LIST => true,
             _ => false,
         }
     }
@@ -3206,8 +3206,8 @@ impl AstNode for TupleExpr {
         &self.syntax
     }
 }
-impl TupleExpr {
-    pub fn exprs(&self) -> AstChildren<Expr> {
+impl TupleFieldDefList {
+    pub fn fields(&self) -> AstChildren<TupleFieldDef> {
         AstChildren::new(&self.syntax)
     }
 }
diff --git a/crates/ra_syntax/src/grammar.ron b/crates/ra_syntax/src/grammar.ron
index 26efeeba9..4659192cd 100644
--- a/crates/ra_syntax/src/grammar.ron
+++ b/crates/ra_syntax/src/grammar.ron
@@ -161,9 +161,9 @@ Grammar(
         "BIND_PAT",
         "PLACEHOLDER_PAT",
         "PATH_PAT",
-        "STRUCT_PAT",
-        "FIELD_PAT_LIST",
-        "FIELD_PAT",
+        "RECORD_PAT",
+        "RECORD_FIELD_PAT_LIST",
+        "RECORD_FIELD_PAT",
         "TUPLE_STRUCT_PAT",
         "TUPLE_PAT",
         "SLICE_PAT",
@@ -190,9 +190,9 @@ Grammar(
         "MATCH_ARM_LIST",
         "MATCH_ARM",
         "MATCH_GUARD",
-        "STRUCT_LIT",
-        "NAMED_FIELD_LIST",
-        "NAMED_FIELD",
+        "RECORD_LIT",
+        "RECORD_FIELD_LIST",
+        "RECORD_FIELD",
         "TRY_BLOCK_EXPR",
         "BOX_EXPR",
 
@@ -216,10 +216,10 @@ Grammar(
         "EXTERN_BLOCK",
         "EXTERN_ITEM_LIST",
         "ENUM_VARIANT",
-        "NAMED_FIELD_DEF_LIST",
-        "NAMED_FIELD_DEF",
-        "POS_FIELD_DEF_LIST",
-        "POS_FIELD_DEF",
+        "RECORD_FIELD_DEF_LIST",
+        "RECORD_FIELD_DEF",
+        "TUPLE_FIELD_DEF_LIST",
+        "TUPLE_FIELD_DEF",
         "ENUM_VARIANT_LIST",
         "ITEM_LIST",
         "ATTR",
@@ -286,8 +286,8 @@ Grammar(
                 "DocCommentsOwner"
             ]
         ),
-        "NamedFieldDefList": (collections: [("fields", "NamedFieldDef")]),
-        "NamedFieldDef": (
+        "RecordFieldDefList": (collections: [("fields", "RecordFieldDef")]),
+        "RecordFieldDef": (
             traits: [
                 "VisibilityOwner",
                 "NameOwner",
@@ -296,8 +296,8 @@ Grammar(
                 "TypeAscriptionOwner"
             ]
         ),
-        "PosFieldDefList": (collections: [("fields", "PosFieldDef")]),
-        "PosFieldDef": ( traits: ["VisibilityOwner", "AttrsOwner"], options: ["TypeRef"]),
+        "TupleFieldDefList": (collections: [("fields", "TupleFieldDef")]),
+        "TupleFieldDef": ( traits: ["VisibilityOwner", "AttrsOwner"], options: ["TypeRef"]),
         "EnumDef": ( traits: [
             "VisibilityOwner",
             "NameOwner",
@@ -461,12 +461,12 @@ Grammar(
             traits: [ "AttrsOwner" ]
         ),
         "MatchGuard": (options: ["Expr"]),
-        "StructLit": (options: ["Path", "NamedFieldList"]),
-        "NamedFieldList": (
-            collections: [ ("fields", "NamedField") ],
+        "RecordLit": (options: ["Path", "RecordFieldList"]),
+        "RecordFieldList": (
+            collections: [ ("fields", "RecordField") ],
             options: [["spread", "Expr"]]
         ),
-        "NamedField": (options: ["NameRef", "Expr"]),
+        "RecordField": (options: ["NameRef", "Expr"]),
         "CallExpr": (
             traits: ["ArgListOwner"],
             options: [ "Expr" ],
@@ -504,7 +504,7 @@ Grammar(
                 "BlockExpr",
                 "ReturnExpr",
                 "MatchExpr",
-                "StructLit",
+                "RecordLit",
                 "CallExpr",
                 "IndexExpr",
                 "MethodCallExpr",
@@ -529,14 +529,14 @@ Grammar(
         ),
         "PlaceholderPat": (),
         "PathPat": ( options: [ "Path" ] ),
-        "StructPat": ( options: ["FieldPatList", "Path"] ),
-        "FieldPatList": (
+        "RecordPat": ( options: ["RecordFieldPatList", "Path"] ),
+        "RecordFieldPatList": (
             collections: [
-                ("field_pats", "FieldPat"),
+                ("record_field_pats", "RecordFieldPat"),
                 ("bind_pats", "BindPat"),
             ]
         ),
-        "FieldPat": (
+        "RecordFieldPat": (
             traits: ["NameOwner"],
             options: ["Pat"]
         ),
@@ -555,7 +555,7 @@ Grammar(
                 "BindPat",
                 "PlaceholderPat",
                 "PathPat",
-                "StructPat",
+                "RecordPat",
                 "TupleStructPat",
                 "TuplePat",
                 "SlicePat",
diff --git a/crates/ra_syntax/src/parsing/text_tree_sink.rs b/crates/ra_syntax/src/parsing/text_tree_sink.rs
index bf1b35c95..f59c559e9 100644
--- a/crates/ra_syntax/src/parsing/text_tree_sink.rs
+++ b/crates/ra_syntax/src/parsing/text_tree_sink.rs
@@ -145,7 +145,7 @@ fn n_attached_trivias<'a>(
 ) -> usize {
     match kind {
         CONST_DEF | TYPE_ALIAS_DEF | STRUCT_DEF | ENUM_DEF | ENUM_VARIANT | FN_DEF | TRAIT_DEF
-        | MODULE | NAMED_FIELD_DEF => {
+        | MODULE | RECORD_FIELD_DEF => {
             let mut res = 0;
             for (i, (kind, text)) in trivias.enumerate() {
                 match kind {
diff --git a/crates/ra_syntax/src/ptr.rs b/crates/ra_syntax/src/ptr.rs
index 8665c8976..d24660ac3 100644
--- a/crates/ra_syntax/src/ptr.rs
+++ b/crates/ra_syntax/src/ptr.rs
@@ -80,7 +80,7 @@ fn test_local_syntax_ptr() {
     use crate::{ast, AstNode, SourceFile};
 
     let file = SourceFile::parse("struct Foo { f: u32, }").ok().unwrap();
-    let field = file.syntax().descendants().find_map(ast::NamedFieldDef::cast).unwrap();
+    let field = file.syntax().descendants().find_map(ast::RecordFieldDef::cast).unwrap();
     let ptr = SyntaxNodePtr::new(field.syntax());
     let field_syntax = ptr.to_node(file.syntax());
     assert_eq!(field.syntax(), &field_syntax);
diff --git a/crates/ra_syntax/src/validation.rs b/crates/ra_syntax/src/validation.rs
index a8c789e0c..ee8797410 100644
--- a/crates/ra_syntax/src/validation.rs
+++ b/crates/ra_syntax/src/validation.rs
@@ -99,7 +99,7 @@ pub(crate) fn validate(root: &SyntaxNode) -> Vec<SyntaxError> {
             .visit::<ast::Literal, _>(validate_literal)
             .visit::<ast::Block, _>(block::validate_block_node)
             .visit::<ast::FieldExpr, _>(|it, errors| validate_numeric_name(it.name_ref(), errors))
-            .visit::<ast::NamedField, _>(|it, errors| validate_numeric_name(it.name_ref(), errors))
+            .visit::<ast::RecordField, _>(|it, errors| validate_numeric_name(it.name_ref(), errors))
             .accept(&node);
     }
     errors
diff --git a/crates/ra_syntax/test_data/parser/err/0000_struct_field_missing_comma.txt b/crates/ra_syntax/test_data/parser/err/0000_struct_field_missing_comma.txt
index 0dbbfe853..dc143945a 100644
--- a/crates/ra_syntax/test_data/parser/err/0000_struct_field_missing_comma.txt
+++ b/crates/ra_syntax/test_data/parser/err/0000_struct_field_missing_comma.txt
@@ -5,10 +5,10 @@ SOURCE_FILE@[0; 34)
     NAME@[7; 8)
       IDENT@[7; 8) "S"
     WHITESPACE@[8; 9) " "
-    NAMED_FIELD_DEF_LIST@[9; 34)
+    RECORD_FIELD_DEF_LIST@[9; 34)
       L_CURLY@[9; 10) "{"
       WHITESPACE@[10; 15) "\n    "
-      NAMED_FIELD_DEF@[15; 21)
+      RECORD_FIELD_DEF@[15; 21)
         NAME@[15; 16)
           IDENT@[15; 16) "a"
         COLON@[16; 17) ":"
@@ -19,7 +19,7 @@ SOURCE_FILE@[0; 34)
               NAME_REF@[18; 21)
                 IDENT@[18; 21) "u32"
       WHITESPACE@[21; 26) "\n    "
-      NAMED_FIELD_DEF@[26; 32)
+      RECORD_FIELD_DEF@[26; 32)
         NAME@[26; 27)
           IDENT@[26; 27) "b"
         COLON@[27; 28) ":"
diff --git a/crates/ra_syntax/test_data/parser/err/0001_item_recovery_in_file.txt b/crates/ra_syntax/test_data/parser/err/0001_item_recovery_in_file.txt
index 7cfb54ef8..181bcdb9e 100644
--- a/crates/ra_syntax/test_data/parser/err/0001_item_recovery_in_file.txt
+++ b/crates/ra_syntax/test_data/parser/err/0001_item_recovery_in_file.txt
@@ -11,7 +11,7 @@ SOURCE_FILE@[0; 21)
     NAME@[17; 18)
       IDENT@[17; 18) "S"
     WHITESPACE@[18; 19) " "
-    NAMED_FIELD_DEF_LIST@[19; 21)
+    RECORD_FIELD_DEF_LIST@[19; 21)
       L_CURLY@[19; 20) "{"
       R_CURLY@[20; 21) "}"
 error 0: expected an item
diff --git a/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.txt b/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.txt
index 857826037..58d005902 100644
--- a/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.txt
+++ b/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.txt
@@ -5,10 +5,10 @@ SOURCE_FILE@[0; 40)
     NAME@[7; 8)
       IDENT@[7; 8) "S"
     WHITESPACE@[8; 9) " "
-    NAMED_FIELD_DEF_LIST@[9; 39)
+    RECORD_FIELD_DEF_LIST@[9; 39)
       L_CURLY@[9; 10) "{"
       WHITESPACE@[10; 15) "\n    "
-      NAMED_FIELD_DEF@[15; 21)
+      RECORD_FIELD_DEF@[15; 21)
         NAME@[15; 16)
           IDENT@[15; 16) "a"
         COLON@[16; 17) ":"
@@ -20,7 +20,7 @@ SOURCE_FILE@[0; 40)
                 IDENT@[18; 21) "i32"
       COMMA@[21; 22) ","
       WHITESPACE@[22; 27) "\n    "
-      NAMED_FIELD_DEF@[27; 36)
+      RECORD_FIELD_DEF@[27; 36)
         NAME@[27; 28)
           IDENT@[27; 28) "b"
         COLON@[28; 29) ":"
diff --git a/crates/ra_syntax/test_data/parser/err/0006_named_field_recovery.txt b/crates/ra_syntax/test_data/parser/err/0006_named_field_recovery.txt
index 6143e68f1..5f5198b31 100644
--- a/crates/ra_syntax/test_data/parser/err/0006_named_field_recovery.txt
+++ b/crates/ra_syntax/test_data/parser/err/0006_named_field_recovery.txt
@@ -5,10 +5,10 @@ SOURCE_FILE@[0; 74)
     NAME@[7; 8)
       IDENT@[7; 8) "S"
     WHITESPACE@[8; 9) " "
-    NAMED_FIELD_DEF_LIST@[9; 73)
+    RECORD_FIELD_DEF_LIST@[9; 73)
       L_CURLY@[9; 10) "{"
       WHITESPACE@[10; 15) "\n    "
-      NAMED_FIELD_DEF@[15; 21)
+      RECORD_FIELD_DEF@[15; 21)
         NAME@[15; 16)
           IDENT@[15; 16) "f"
         COLON@[16; 17) ":"
@@ -35,7 +35,7 @@ SOURCE_FILE@[0; 74)
       ERROR@[42; 43)
         STAR@[42; 43) "*"
       WHITESPACE@[43; 48) "\n    "
-      NAMED_FIELD_DEF@[48; 58)
+      RECORD_FIELD_DEF@[48; 58)
         VISIBILITY@[48; 51)
           PUB_KW@[48; 51) "pub"
         WHITESPACE@[51; 52) " "
@@ -50,7 +50,7 @@ SOURCE_FILE@[0; 74)
                 IDENT@[55; 58) "u32"
       COMMA@[58; 59) ","
       WHITESPACE@[59; 64) "\n    "
-      NAMED_FIELD_DEF@[64; 70)
+      RECORD_FIELD_DEF@[64; 70)
         NAME@[64; 65)
           IDENT@[64; 65) "z"
         COLON@[65; 66) ":"
diff --git a/crates/ra_syntax/test_data/parser/err/0013_invalid_type.txt b/crates/ra_syntax/test_data/parser/err/0013_invalid_type.txt
index bef286b37..4907bac6d 100644
--- a/crates/ra_syntax/test_data/parser/err/0013_invalid_type.txt
+++ b/crates/ra_syntax/test_data/parser/err/0013_invalid_type.txt
@@ -7,10 +7,10 @@ SOURCE_FILE@[0; 86)
     WHITESPACE@[10; 11) " "
     NAME@[11; 16)
       IDENT@[11; 16) "Cache"
-    POS_FIELD_DEF_LIST@[16; 72)
+    TUPLE_FIELD_DEF_LIST@[16; 72)
       L_PAREN@[16; 17) "("
       WHITESPACE@[17; 22) "\n    "
-      POS_FIELD_DEF@[22; 68)
+      TUPLE_FIELD_DEF@[22; 68)
         PATH_TYPE@[22; 68)
           PATH@[22; 68)
             PATH_SEGMENT@[22; 68)
@@ -47,7 +47,7 @@ SOURCE_FILE@[0; 86)
                                       ERROR@[67; 68)
                                         AT@[67; 68) "@"
       WHITESPACE@[68; 69) " "
-      POS_FIELD_DEF@[69; 72)
+      TUPLE_FIELD_DEF@[69; 72)
         PATH_TYPE@[69; 72)
           PATH@[69; 72)
             PATH_SEGMENT@[69; 72)
diff --git a/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.txt b/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.txt
index 51def2d8f..52eb7d5e2 100644
--- a/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.txt
+++ b/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.txt
@@ -75,16 +75,16 @@ SOURCE_FILE@[0; 183)
               IDENT@[106; 110) "push"
             ARG_LIST@[110; 155)
               L_PAREN@[110; 111) "("
-              STRUCT_LIT@[111; 154)
+              RECORD_LIT@[111; 154)
                 PATH@[111; 120)
                   PATH_SEGMENT@[111; 120)
                     NAME_REF@[111; 120)
                       IDENT@[111; 120) "ScopeData"
                 WHITESPACE@[120; 121) " "
-                NAMED_FIELD_LIST@[121; 154)
+                RECORD_FIELD_LIST@[121; 154)
                   L_CURLY@[121; 122) "{"
                   WHITESPACE@[122; 123) " "
-                  NAMED_FIELD@[123; 135)
+                  RECORD_FIELD@[123; 135)
                     NAME_REF@[123; 129)
                       IDENT@[123; 129) "parent"
                     COLON@[129; 130) ":"
@@ -96,7 +96,7 @@ SOURCE_FILE@[0; 183)
                             IDENT@[131; 135) "None"
                   COMMA@[135; 136) ","
                   WHITESPACE@[136; 137) " "
-                  NAMED_FIELD@[137; 152)
+                  RECORD_FIELD@[137; 152)
                     NAME_REF@[137; 144)
                       IDENT@[137; 144) "entries"
                     COLON@[144; 145) ":"
diff --git a/crates/ra_syntax/test_data/parser/err/0025_nope.txt b/crates/ra_syntax/test_data/parser/err/0025_nope.txt
index 0a3952dc9..7b228a8ed 100644
--- a/crates/ra_syntax/test_data/parser/err/0025_nope.txt
+++ b/crates/ra_syntax/test_data/parser/err/0025_nope.txt
@@ -28,9 +28,9 @@ SOURCE_FILE@[0; 575)
           ENUM_VARIANT@[50; 62)
             NAME@[50; 54)
               IDENT@[50; 54) "Var2"
-            POS_FIELD_DEF_LIST@[54; 62)
+            TUPLE_FIELD_DEF_LIST@[54; 62)
               L_PAREN@[54; 55) "("
-              POS_FIELD_DEF@[55; 61)
+              TUPLE_FIELD_DEF@[55; 61)
                 PATH_TYPE@[55; 61)
                   PATH@[55; 61)
                     PATH_SEGMENT@[55; 61)
@@ -43,10 +43,10 @@ SOURCE_FILE@[0; 575)
             NAME@[72; 76)
               IDENT@[72; 76) "Var3"
             WHITESPACE@[76; 77) " "
-            NAMED_FIELD_DEF_LIST@[77; 145)
+            RECORD_FIELD_DEF_LIST@[77; 145)
               L_CURLY@[77; 78) "{"
               WHITESPACE@[78; 91) "\n            "
-              NAMED_FIELD_DEF@[91; 95)
+              RECORD_FIELD_DEF@[91; 95)
                 NAME@[91; 94)
                   IDENT@[91; 94) "abc"
                 COLON@[94; 95) ":"
@@ -108,10 +108,10 @@ SOURCE_FILE@[0; 575)
             NAME@[250; 259)
               IDENT@[250; 259) "StillFine"
             WHITESPACE@[259; 260) " "
-            NAMED_FIELD_DEF_LIST@[260; 293)
+            RECORD_FIELD_DEF_LIST@[260; 293)
               L_CURLY@[260; 261) "{"
               WHITESPACE@[261; 274) "\n            "
-              NAMED_FIELD_DEF@[274; 282)
+              RECORD_FIELD_DEF@[274; 282)
                 NAME@[274; 277)
                   IDENT@[274; 277) "def"
                 COLON@[277; 278) ":"
@@ -147,9 +147,9 @@ SOURCE_FILE@[0; 575)
                 ENUM_VARIANT@[363; 372)
                   NAME@[363; 367)
                     IDENT@[363; 367) "Nope"
-                  POS_FIELD_DEF_LIST@[367; 372)
+                  TUPLE_FIELD_DEF_LIST@[367; 372)
                     L_PAREN@[367; 368) "("
-                    POS_FIELD_DEF@[368; 371)
+                    TUPLE_FIELD_DEF@[368; 371)
                       PATH_TYPE@[368; 371)
                         PATH@[368; 371)
                           PATH_SEGMENT@[368; 371)
diff --git a/crates/ra_syntax/test_data/parser/fuzz-failures/0000.rs b/crates/ra_syntax/test_data/parser/fuzz-failures/0000.rs
index e0437d163..0e6e0ccc3 100644
--- a/crates/ra_syntax/test_data/parser/fuzz-failures/0000.rs
+++ b/crates/ra_syntax/test_data/parser/fuzz-failures/0000.rs
@@ -86,7 +86,7 @@ fn find_reparsable_node(node: SyntaxNodeRef, range: TextRange) -> Option<(Syntax
     fn reparser(node: SyntaxNodeRef) -> Option<fn(&mut Parser)> {
         let res = match node.kind() {
             BLOCK => grammar::block,
-            NAMED_FIELD_DEF_LIST => grammar::named_field_def_list,
+            RECORD_FIELD_DEF_LIST => grammar::record_field_def_list,
             _ => return None,
         };
         Some(res)
@@ -138,7 +138,7 @@ fn find_reparsable_node(node: SyntaxNodeRef, range: TextRange) -> Option<(Syntax
         let res = match node.kind() {
      ;
     let end = u32::from(range.end()) as usize;
-    text.replaT => grammar::named_field_def_list,
+    text.replaT => grammar::record_field_def_list,
             _ => return None,
         };
         Some(res)
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.txt b/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.txt
index 0c6be485e..4108762e5 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.txt
@@ -52,13 +52,13 @@ SOURCE_FILE@[0; 103)
       LET_STMT@[58; 78)
         LET_KW@[58; 61) "let"
         WHITESPACE@[61; 62) " "
-        STRUCT_PAT@[62; 72)
+        RECORD_PAT@[62; 72)
           PATH@[62; 65)
             PATH_SEGMENT@[62; 65)
               NAME_REF@[62; 65)
                 IDENT@[62; 65) "Bar"
           WHITESPACE@[65; 66) " "
-          FIELD_PAT_LIST@[66; 72)
+          RECORD_FIELD_PAT_LIST@[66; 72)
             L_CURLY@[66; 67) "{"
             WHITESPACE@[67; 68) " "
             DOTDOT@[68; 70) ".."
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.txt b/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.txt
index fb8246174..882e4a9ae 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.txt
@@ -22,10 +22,10 @@ SOURCE_FILE@[0; 71)
     NAME@[27; 28)
       IDENT@[27; 28) "S"
     WHITESPACE@[28; 29) " "
-    NAMED_FIELD_DEF_LIST@[29; 49)
+    RECORD_FIELD_DEF_LIST@[29; 49)
       L_CURLY@[29; 30) "{"
       WHITESPACE@[30; 31) " "
-      NAMED_FIELD_DEF@[31; 47)
+      RECORD_FIELD_DEF@[31; 47)
         VISIBILITY@[31; 36)
           CRATE_KW@[31; 36) "crate"
         WHITESPACE@[36; 37) " "
@@ -46,9 +46,9 @@ SOURCE_FILE@[0; 71)
     WHITESPACE@[56; 57) " "
     NAME@[57; 58)
       IDENT@[57; 58) "T"
-    POS_FIELD_DEF_LIST@[58; 69)
+    TUPLE_FIELD_DEF_LIST@[58; 69)
       L_PAREN@[58; 59) "("
-      POS_FIELD_DEF@[59; 68)
+      TUPLE_FIELD_DEF@[59; 68)
         VISIBILITY@[59; 64)
           CRATE_KW@[59; 64) "crate"
         WHITESPACE@[64; 65) " "
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0054_field_attrs.rs b/crates/ra_syntax/test_data/parser/inline/ok/0054_record_field_attrs.rs
index 4744d8ac0..4744d8ac0 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0054_field_attrs.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0054_record_field_attrs.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0054_field_attrs.txt b/crates/ra_syntax/test_data/parser/inline/ok/0054_record_field_attrs.txt
index f214d1d47..56aeba768 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0054_field_attrs.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0054_record_field_attrs.txt
@@ -5,10 +5,10 @@ SOURCE_FILE@[0; 64)
     NAME@[7; 8)
       IDENT@[7; 8) "S"
     WHITESPACE@[8; 9) " "
-    NAMED_FIELD_DEF_LIST@[9; 63)
+    RECORD_FIELD_DEF_LIST@[9; 63)
       L_CURLY@[9; 10) "{"
       WHITESPACE@[10; 15) "\n    "
-      NAMED_FIELD_DEF@[15; 60)
+      RECORD_FIELD_DEF@[15; 60)
         ATTR@[15; 43)
           POUND@[15; 16) "#"
           TOKEN_TREE@[16; 43)
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0061_struct_lit.rs b/crates/ra_syntax/test_data/parser/inline/ok/0061_record_lit.rs
index 6285e5549..6285e5549 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0061_struct_lit.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0061_record_lit.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0061_struct_lit.txt b/crates/ra_syntax/test_data/parser/inline/ok/0061_record_lit.txt
index d06594cae..1c915ea0c 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0061_struct_lit.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0061_record_lit.txt
@@ -12,33 +12,33 @@ SOURCE_FILE@[0; 112)
       L_CURLY@[9; 10) "{"
       WHITESPACE@[10; 15) "\n    "
       EXPR_STMT@[15; 20)
-        STRUCT_LIT@[15; 19)
+        RECORD_LIT@[15; 19)
           PATH@[15; 16)
             PATH_SEGMENT@[15; 16)
               NAME_REF@[15; 16)
                 IDENT@[15; 16) "S"
           WHITESPACE@[16; 17) " "
-          NAMED_FIELD_LIST@[17; 19)
+          RECORD_FIELD_LIST@[17; 19)
             L_CURLY@[17; 18) "{"
             R_CURLY@[18; 19) "}"
         SEMI@[19; 20) ";"
       WHITESPACE@[20; 25) "\n    "
       EXPR_STMT@[25; 41)
-        STRUCT_LIT@[25; 40)
+        RECORD_LIT@[25; 40)
           PATH@[25; 26)
             PATH_SEGMENT@[25; 26)
               NAME_REF@[25; 26)
                 IDENT@[25; 26) "S"
           WHITESPACE@[26; 27) " "
-          NAMED_FIELD_LIST@[27; 40)
+          RECORD_FIELD_LIST@[27; 40)
             L_CURLY@[27; 28) "{"
             WHITESPACE@[28; 29) " "
-            NAMED_FIELD@[29; 30)
+            RECORD_FIELD@[29; 30)
               NAME_REF@[29; 30)
                 IDENT@[29; 30) "x"
             COMMA@[30; 31) ","
             WHITESPACE@[31; 32) " "
-            NAMED_FIELD@[32; 37)
+            RECORD_FIELD@[32; 37)
               NAME_REF@[32; 33)
                 IDENT@[32; 33) "y"
               COLON@[33; 34) ":"
@@ -51,21 +51,21 @@ SOURCE_FILE@[0; 112)
         SEMI@[40; 41) ";"
       WHITESPACE@[41; 46) "\n    "
       EXPR_STMT@[46; 83)
-        STRUCT_LIT@[46; 82)
+        RECORD_LIT@[46; 82)
           PATH@[46; 47)
             PATH_SEGMENT@[46; 47)
               NAME_REF@[46; 47)
                 IDENT@[46; 47) "S"
           WHITESPACE@[47; 48) " "
-          NAMED_FIELD_LIST@[48; 82)
+          RECORD_FIELD_LIST@[48; 82)
             L_CURLY@[48; 49) "{"
             WHITESPACE@[49; 50) " "
-            NAMED_FIELD@[50; 51)
+            RECORD_FIELD@[50; 51)
               NAME_REF@[50; 51)
                 IDENT@[50; 51) "x"
             COMMA@[51; 52) ","
             WHITESPACE@[52; 53) " "
-            NAMED_FIELD@[53; 58)
+            RECORD_FIELD@[53; 58)
               NAME_REF@[53; 54)
                 IDENT@[53; 54) "y"
               COLON@[54; 55) ":"
@@ -94,16 +94,16 @@ SOURCE_FILE@[0; 112)
         SEMI@[82; 83) ";"
       WHITESPACE@[83; 88) "\n    "
       EXPR_STMT@[88; 109)
-        STRUCT_LIT@[88; 108)
+        RECORD_LIT@[88; 108)
           PATH@[88; 99)
             PATH_SEGMENT@[88; 99)
               NAME_REF@[88; 99)
                 IDENT@[88; 99) "TupleStruct"
           WHITESPACE@[99; 100) " "
-          NAMED_FIELD_LIST@[100; 108)
+          RECORD_FIELD_LIST@[100; 108)
             L_CURLY@[100; 101) "{"
             WHITESPACE@[101; 102) " "
-            NAMED_FIELD@[102; 106)
+            RECORD_FIELD@[102; 106)
               NAME_REF@[102; 103)
                 INT_NUMBER@[102; 103) "0"
               COLON@[103; 104) ":"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.txt b/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.txt
index 28d501459..35f023782 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.txt
@@ -49,14 +49,14 @@ SOURCE_FILE@[0; 215)
                   WHITESPACE@[60; 61) " "
                   R_ANGLE@[61; 62) ">"
                   WHITESPACE@[62; 63) " "
-                  STRUCT_LIT@[63; 77)
+                  RECORD_LIT@[63; 77)
                     PATH@[63; 67)
                       PATH_SEGMENT@[63; 67)
                         NAME_REF@[63; 67)
                           IDENT@[63; 67) "Test"
-                    NAMED_FIELD_LIST@[67; 77)
+                    RECORD_FIELD_LIST@[67; 77)
                       L_CURLY@[67; 68) "{"
-                      NAMED_FIELD@[68; 76)
+                      RECORD_FIELD@[68; 76)
                         NAME_REF@[68; 73)
                           IDENT@[68; 73) "field"
                         COLON@[73; 74) ":"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0068_union_items.txt b/crates/ra_syntax/test_data/parser/inline/ok/0068_union_items.txt
index 4b653317b..f9ace02ee 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0068_union_items.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0068_union_items.txt
@@ -5,7 +5,7 @@ SOURCE_FILE@[0; 51)
     NAME@[6; 9)
       IDENT@[6; 9) "Foo"
     WHITESPACE@[9; 10) " "
-    NAMED_FIELD_DEF_LIST@[10; 12)
+    RECORD_FIELD_DEF_LIST@[10; 12)
       L_CURLY@[10; 11) "{"
       R_CURLY@[11; 12) "}"
   WHITESPACE@[12; 13) "\n"
@@ -15,10 +15,10 @@ SOURCE_FILE@[0; 51)
     NAME@[19; 22)
       IDENT@[19; 22) "Foo"
     WHITESPACE@[22; 23) " "
-    NAMED_FIELD_DEF_LIST@[23; 50)
+    RECORD_FIELD_DEF_LIST@[23; 50)
       L_CURLY@[23; 24) "{"
       WHITESPACE@[24; 29) "\n    "
-      NAMED_FIELD_DEF@[29; 35)
+      RECORD_FIELD_DEF@[29; 35)
         NAME@[29; 30)
           IDENT@[29; 30) "a"
         COLON@[30; 31) ":"
@@ -30,7 +30,7 @@ SOURCE_FILE@[0; 51)
                 IDENT@[32; 35) "i32"
       COMMA@[35; 36) ","
       WHITESPACE@[36; 41) "\n    "
-      NAMED_FIELD_DEF@[41; 47)
+      RECORD_FIELD_DEF@[41; 47)
         NAME@[41; 42)
           IDENT@[41; 42) "b"
         COLON@[42; 43) ":"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0083_struct_items.txt b/crates/ra_syntax/test_data/parser/inline/ok/0083_struct_items.txt
index 62d93512b..e909f2b78 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0083_struct_items.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0083_struct_items.txt
@@ -12,7 +12,7 @@ SOURCE_FILE@[0; 106)
     NAME@[19; 22)
       IDENT@[19; 22) "Foo"
     WHITESPACE@[22; 23) " "
-    NAMED_FIELD_DEF_LIST@[23; 25)
+    RECORD_FIELD_DEF_LIST@[23; 25)
       L_CURLY@[23; 24) "{"
       R_CURLY@[24; 25) "}"
   WHITESPACE@[25; 26) "\n"
@@ -21,7 +21,7 @@ SOURCE_FILE@[0; 106)
     WHITESPACE@[32; 33) " "
     NAME@[33; 36)
       IDENT@[33; 36) "Foo"
-    POS_FIELD_DEF_LIST@[36; 38)
+    TUPLE_FIELD_DEF_LIST@[36; 38)
       L_PAREN@[36; 37) "("
       R_PAREN@[37; 38) ")"
     SEMI@[38; 39) ";"
@@ -31,9 +31,9 @@ SOURCE_FILE@[0; 106)
     WHITESPACE@[46; 47) " "
     NAME@[47; 50)
       IDENT@[47; 50) "Foo"
-    POS_FIELD_DEF_LIST@[50; 65)
+    TUPLE_FIELD_DEF_LIST@[50; 65)
       L_PAREN@[50; 51) "("
-      POS_FIELD_DEF@[51; 57)
+      TUPLE_FIELD_DEF@[51; 57)
         PATH_TYPE@[51; 57)
           PATH@[51; 57)
             PATH_SEGMENT@[51; 57)
@@ -41,7 +41,7 @@ SOURCE_FILE@[0; 106)
                 IDENT@[51; 57) "String"
       COMMA@[57; 58) ","
       WHITESPACE@[58; 59) " "
-      POS_FIELD_DEF@[59; 64)
+      TUPLE_FIELD_DEF@[59; 64)
         PATH_TYPE@[59; 64)
           PATH@[59; 64)
             PATH_SEGMENT@[59; 64)
@@ -56,10 +56,10 @@ SOURCE_FILE@[0; 106)
     NAME@[74; 77)
       IDENT@[74; 77) "Foo"
     WHITESPACE@[77; 78) " "
-    NAMED_FIELD_DEF_LIST@[78; 105)
+    RECORD_FIELD_DEF_LIST@[78; 105)
       L_CURLY@[78; 79) "{"
       WHITESPACE@[79; 84) "\n    "
-      NAMED_FIELD_DEF@[84; 90)
+      RECORD_FIELD_DEF@[84; 90)
         NAME@[84; 85)
           IDENT@[84; 85) "a"
         COLON@[85; 86) ":"
@@ -71,7 +71,7 @@ SOURCE_FILE@[0; 106)
                 IDENT@[87; 90) "i32"
       COMMA@[90; 91) ","
       WHITESPACE@[91; 96) "\n    "
-      NAMED_FIELD_DEF@[96; 102)
+      RECORD_FIELD_DEF@[96; 102)
         NAME@[96; 97)
           IDENT@[96; 97) "b"
         COLON@[97; 98) ":"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0102_field_pat_list.rs b/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rs
index da3412fa8..da3412fa8 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0102_field_pat_list.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0102_field_pat_list.txt b/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.txt
index a2af4fc60..22db72c12 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0102_field_pat_list.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.txt
@@ -14,13 +14,13 @@ SOURCE_FILE@[0; 119)
       LET_STMT@[15; 29)
         LET_KW@[15; 18) "let"
         WHITESPACE@[18; 19) " "
-        STRUCT_PAT@[19; 23)
+        RECORD_PAT@[19; 23)
           PATH@[19; 20)
             PATH_SEGMENT@[19; 20)
               NAME_REF@[19; 20)
                 IDENT@[19; 20) "S"
           WHITESPACE@[20; 21) " "
-          FIELD_PAT_LIST@[21; 23)
+          RECORD_FIELD_PAT_LIST@[21; 23)
             L_CURLY@[21; 22) "{"
             R_CURLY@[22; 23) "}"
         WHITESPACE@[23; 24) " "
@@ -34,13 +34,13 @@ SOURCE_FILE@[0; 119)
       LET_STMT@[34; 62)
         LET_KW@[34; 37) "let"
         WHITESPACE@[37; 38) " "
-        STRUCT_PAT@[38; 56)
+        RECORD_PAT@[38; 56)
           PATH@[38; 39)
             PATH_SEGMENT@[38; 39)
               NAME_REF@[38; 39)
                 IDENT@[38; 39) "S"
           WHITESPACE@[39; 40) " "
-          FIELD_PAT_LIST@[40; 56)
+          RECORD_FIELD_PAT_LIST@[40; 56)
             L_CURLY@[40; 41) "{"
             WHITESPACE@[41; 42) " "
             BIND_PAT@[42; 43)
@@ -68,16 +68,16 @@ SOURCE_FILE@[0; 119)
       LET_STMT@[67; 90)
         LET_KW@[67; 70) "let"
         WHITESPACE@[70; 71) " "
-        STRUCT_PAT@[71; 84)
+        RECORD_PAT@[71; 84)
           PATH@[71; 72)
             PATH_SEGMENT@[71; 72)
               NAME_REF@[71; 72)
                 IDENT@[71; 72) "S"
           WHITESPACE@[72; 73) " "
-          FIELD_PAT_LIST@[73; 84)
+          RECORD_FIELD_PAT_LIST@[73; 84)
             L_CURLY@[73; 74) "{"
             WHITESPACE@[74; 75) " "
-            FIELD_PAT@[75; 79)
+            RECORD_FIELD_PAT@[75; 79)
               NAME@[75; 76)
                 IDENT@[75; 76) "h"
               COLON@[76; 77) ":"
@@ -99,16 +99,16 @@ SOURCE_FILE@[0; 119)
       LET_STMT@[95; 116)
         LET_KW@[95; 98) "let"
         WHITESPACE@[98; 99) " "
-        STRUCT_PAT@[99; 110)
+        RECORD_PAT@[99; 110)
           PATH@[99; 100)
             PATH_SEGMENT@[99; 100)
               NAME_REF@[99; 100)
                 IDENT@[99; 100) "S"
           WHITESPACE@[100; 101) " "
-          FIELD_PAT_LIST@[101; 110)
+          RECORD_FIELD_PAT_LIST@[101; 110)
             L_CURLY@[101; 102) "{"
             WHITESPACE@[102; 103) " "
-            FIELD_PAT@[103; 107)
+            RECORD_FIELD_PAT@[103; 107)
               NAME@[103; 104)
                 IDENT@[103; 104) "h"
               COLON@[104; 105) ":"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0114_tuple_struct_where.txt b/crates/ra_syntax/test_data/parser/inline/ok/0114_tuple_struct_where.txt
index 8534592b9..f5de01405 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0114_tuple_struct_where.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0114_tuple_struct_where.txt
@@ -10,9 +10,9 @@ SOURCE_FILE@[0; 53)
         NAME@[12; 13)
           IDENT@[12; 13) "T"
       R_ANGLE@[13; 14) ">"
-    POS_FIELD_DEF_LIST@[14; 17)
+    TUPLE_FIELD_DEF_LIST@[14; 17)
       L_PAREN@[14; 15) "("
-      POS_FIELD_DEF@[15; 16)
+      TUPLE_FIELD_DEF@[15; 16)
         PATH_TYPE@[15; 16)
           PATH@[15; 16)
             PATH_SEGMENT@[15; 16)
@@ -51,9 +51,9 @@ SOURCE_FILE@[0; 53)
         NAME@[46; 47)
           IDENT@[46; 47) "T"
       R_ANGLE@[47; 48) ">"
-    POS_FIELD_DEF_LIST@[48; 51)
+    TUPLE_FIELD_DEF_LIST@[48; 51)
       L_PAREN@[48; 49) "("
-      POS_FIELD_DEF@[49; 50)
+      TUPLE_FIELD_DEF@[49; 50)
         PATH_TYPE@[49; 50)
           PATH@[49; 50)
             PATH_SEGMENT@[49; 50)
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0115_pos_field_attrs.rs b/crates/ra_syntax/test_data/parser/inline/ok/0115_tuple_field_attrs.rs
index 635b9ac21..635b9ac21 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0115_pos_field_attrs.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0115_tuple_field_attrs.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0115_pos_field_attrs.txt b/crates/ra_syntax/test_data/parser/inline/ok/0115_tuple_field_attrs.txt
index 6dd3a9b93..cb6d9f76d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0115_pos_field_attrs.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0115_tuple_field_attrs.txt
@@ -5,10 +5,10 @@ SOURCE_FILE@[0; 60)
     NAME@[7; 8)
       IDENT@[7; 8) "S"
     WHITESPACE@[8; 9) " "
-    POS_FIELD_DEF_LIST@[9; 58)
+    TUPLE_FIELD_DEF_LIST@[9; 58)
       L_PAREN@[9; 10) "("
       WHITESPACE@[10; 15) "\n    "
-      POS_FIELD_DEF@[15; 55)
+      TUPLE_FIELD_DEF@[15; 55)
         ATTR@[15; 43)
           POUND@[15; 16) "#"
           TOKEN_TREE@[16; 43)
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0125_struct_literal_field_with_attr.rs b/crates/ra_syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rs
index a6c7760c7..a6c7760c7 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0125_struct_literal_field_with_attr.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0125_struct_literal_field_with_attr.txt b/crates/ra_syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.txt
index f9c5ec124..8fdf3756f 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0125_struct_literal_field_with_attr.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.txt
@@ -11,16 +11,16 @@ SOURCE_FILE@[0; 46)
     BLOCK@[10; 45)
       L_CURLY@[10; 11) "{"
       WHITESPACE@[11; 16) "\n    "
-      STRUCT_LIT@[16; 43)
+      RECORD_LIT@[16; 43)
         PATH@[16; 17)
           PATH_SEGMENT@[16; 17)
             NAME_REF@[16; 17)
               IDENT@[16; 17) "S"
         WHITESPACE@[17; 18) " "
-        NAMED_FIELD_LIST@[18; 43)
+        RECORD_FIELD_LIST@[18; 43)
           L_CURLY@[18; 19) "{"
           WHITESPACE@[19; 20) " "
-          NAMED_FIELD@[20; 41)
+          RECORD_FIELD@[20; 41)
             ATTR@[20; 32)
               POUND@[20; 21) "#"
               TOKEN_TREE@[21; 32)
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.txt b/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.txt
index 50d3b5def..64cbf4632 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.txt
@@ -53,7 +53,7 @@ SOURCE_FILE@[0; 111)
         NAME@[103; 104)
           IDENT@[103; 104) "S"
         WHITESPACE@[104; 105) " "
-        NAMED_FIELD_DEF_LIST@[105; 107)
+        RECORD_FIELD_DEF_LIST@[105; 107)
           L_CURLY@[105; 106) "{"
           R_CURLY@[106; 107) "}"
       SEMI@[107; 108) ";"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0138_expression_after_block.txt b/crates/ra_syntax/test_data/parser/inline/ok/0138_expression_after_block.txt
index 08128f365..c4db9da40 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0138_expression_after_block.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0138_expression_after_block.txt
@@ -22,14 +22,14 @@ SOURCE_FILE@[0; 52)
         WHITESPACE@[23; 24) " "
         EQ@[24; 25) "="
         WHITESPACE@[25; 26) " "
-        STRUCT_LIT@[26; 33)
+        RECORD_LIT@[26; 33)
           PATH@[26; 27)
             PATH_SEGMENT@[26; 27)
               NAME_REF@[26; 27)
                 IDENT@[26; 27) "F"
-          NAMED_FIELD_LIST@[27; 33)
+          RECORD_FIELD_LIST@[27; 33)
             L_CURLY@[27; 28) "{"
-            NAMED_FIELD@[28; 32)
+            RECORD_FIELD@[28; 32)
               NAME_REF@[28; 29)
                 IDENT@[28; 29) "x"
               COLON@[29; 30) ":"
diff --git a/crates/ra_syntax/test_data/parser/ok/0001_struct_item.txt b/crates/ra_syntax/test_data/parser/ok/0001_struct_item.txt
index c6653cf25..fdc2d6768 100644
--- a/crates/ra_syntax/test_data/parser/ok/0001_struct_item.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0001_struct_item.txt
@@ -20,10 +20,10 @@ SOURCE_FILE@[0; 32)
                     IDENT@[12; 16) "Copy"
       R_ANGLE@[16; 17) ">"
     WHITESPACE@[17; 18) " "
-    NAMED_FIELD_DEF_LIST@[18; 31)
+    RECORD_FIELD_DEF_LIST@[18; 31)
       L_CURLY@[18; 19) "{"
       WHITESPACE@[19; 24) "\n    "
-      NAMED_FIELD_DEF@[24; 28)
+      RECORD_FIELD_DEF@[24; 28)
         NAME@[24; 25)
           IDENT@[24; 25) "f"
         COLON@[25; 26) ":"
diff --git a/crates/ra_syntax/test_data/parser/ok/0002_struct_item_field.txt b/crates/ra_syntax/test_data/parser/ok/0002_struct_item_field.txt
index d0565ea83..ef34702fd 100644
--- a/crates/ra_syntax/test_data/parser/ok/0002_struct_item_field.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0002_struct_item_field.txt
@@ -5,10 +5,10 @@ SOURCE_FILE@[0; 25)
     NAME@[7; 8)
       IDENT@[7; 8) "S"
     WHITESPACE@[8; 9) " "
-    NAMED_FIELD_DEF_LIST@[9; 25)
+    RECORD_FIELD_DEF_LIST@[9; 25)
       L_CURLY@[9; 10) "{"
       WHITESPACE@[10; 15) "\n    "
-      NAMED_FIELD_DEF@[15; 23)
+      RECORD_FIELD_DEF@[15; 23)
         NAME@[15; 18)
           IDENT@[15; 18) "foo"
         COLON@[18; 19) ":"
diff --git a/crates/ra_syntax/test_data/parser/ok/0008_mod_item.txt b/crates/ra_syntax/test_data/parser/ok/0008_mod_item.txt
index 9152d6eb6..5c16d0be6 100644
--- a/crates/ra_syntax/test_data/parser/ok/0008_mod_item.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0008_mod_item.txt
@@ -46,7 +46,7 @@ SOURCE_FILE@[0; 118)
         NAME@[59; 60)
           IDENT@[59; 60) "S"
         WHITESPACE@[60; 61) " "
-        NAMED_FIELD_DEF_LIST@[61; 63)
+        RECORD_FIELD_DEF_LIST@[61; 63)
           L_CURLY@[61; 62) "{"
           R_CURLY@[62; 63) "}"
       WHITESPACE@[63; 64) "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0016_struct_flavors.txt b/crates/ra_syntax/test_data/parser/ok/0016_struct_flavors.txt
index ac44093e8..3fbd14d7b 100644
--- a/crates/ra_syntax/test_data/parser/ok/0016_struct_flavors.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0016_struct_flavors.txt
@@ -12,7 +12,7 @@ SOURCE_FILE@[0; 97)
     NAME@[17; 18)
       IDENT@[17; 18) "B"
     WHITESPACE@[18; 19) " "
-    NAMED_FIELD_DEF_LIST@[19; 21)
+    RECORD_FIELD_DEF_LIST@[19; 21)
       L_CURLY@[19; 20) "{"
       R_CURLY@[20; 21) "}"
   WHITESPACE@[21; 22) "\n"
@@ -21,7 +21,7 @@ SOURCE_FILE@[0; 97)
     WHITESPACE@[28; 29) " "
     NAME@[29; 30)
       IDENT@[29; 30) "C"
-    POS_FIELD_DEF_LIST@[30; 32)
+    TUPLE_FIELD_DEF_LIST@[30; 32)
       L_PAREN@[30; 31) "("
       R_PAREN@[31; 32) ")"
     SEMI@[32; 33) ";"
@@ -32,10 +32,10 @@ SOURCE_FILE@[0; 97)
     NAME@[42; 43)
       IDENT@[42; 43) "D"
     WHITESPACE@[43; 44) " "
-    NAMED_FIELD_DEF_LIST@[44; 74)
+    RECORD_FIELD_DEF_LIST@[44; 74)
       L_CURLY@[44; 45) "{"
       WHITESPACE@[45; 50) "\n    "
-      NAMED_FIELD_DEF@[50; 56)
+      RECORD_FIELD_DEF@[50; 56)
         NAME@[50; 51)
           IDENT@[50; 51) "a"
         COLON@[51; 52) ":"
@@ -47,7 +47,7 @@ SOURCE_FILE@[0; 97)
                 IDENT@[53; 56) "u32"
       COMMA@[56; 57) ","
       WHITESPACE@[57; 62) "\n    "
-      NAMED_FIELD_DEF@[62; 72)
+      RECORD_FIELD_DEF@[62; 72)
         VISIBILITY@[62; 65)
           PUB_KW@[62; 65) "pub"
         WHITESPACE@[65; 66) " "
@@ -68,9 +68,9 @@ SOURCE_FILE@[0; 97)
     WHITESPACE@[82; 83) " "
     NAME@[83; 84)
       IDENT@[83; 84) "E"
-    POS_FIELD_DEF_LIST@[84; 95)
+    TUPLE_FIELD_DEF_LIST@[84; 95)
       L_PAREN@[84; 85) "("
-      POS_FIELD_DEF@[85; 90)
+      TUPLE_FIELD_DEF@[85; 90)
         VISIBILITY@[85; 88)
           PUB_KW@[85; 88) "pub"
         WHITESPACE@[88; 89) " "
@@ -81,7 +81,7 @@ SOURCE_FILE@[0; 97)
                 IDENT@[89; 90) "x"
       COMMA@[90; 91) ","
       WHITESPACE@[91; 92) " "
-      POS_FIELD_DEF@[92; 93)
+      TUPLE_FIELD_DEF@[92; 93)
         PATH_TYPE@[92; 93)
           PATH@[92; 93)
             PATH_SEGMENT@[92; 93)
diff --git a/crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.txt b/crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.txt
index 3f06f20f9..1e4e58dd3 100644
--- a/crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.txt
@@ -23,9 +23,9 @@ SOURCE_FILE@[0; 290)
         NAME@[24; 25)
           IDENT@[24; 25) "T"
       R_ANGLE@[25; 26) ">"
-    POS_FIELD_DEF_LIST@[26; 31)
+    TUPLE_FIELD_DEF_LIST@[26; 31)
       L_PAREN@[26; 27) "("
-      POS_FIELD_DEF@[27; 30)
+      TUPLE_FIELD_DEF@[27; 30)
         PATH_TYPE@[27; 30)
           PATH@[27; 30)
             PATH_SEGMENT@[27; 30)
@@ -46,10 +46,10 @@ SOURCE_FILE@[0; 290)
           IDENT@[43; 44) "T"
       R_ANGLE@[44; 45) ">"
     WHITESPACE@[45; 46) " "
-    NAMED_FIELD_DEF_LIST@[46; 56)
+    RECORD_FIELD_DEF_LIST@[46; 56)
       L_CURLY@[46; 47) "{"
       WHITESPACE@[47; 48) " "
-      NAMED_FIELD_DEF@[48; 54)
+      RECORD_FIELD_DEF@[48; 54)
         NAME@[48; 49)
           IDENT@[48; 49) "u"
         COLON@[49; 50) ":"
diff --git a/crates/ra_syntax/test_data/parser/ok/0019_enums.txt b/crates/ra_syntax/test_data/parser/ok/0019_enums.txt
index 37753a7d0..9d4a47a51 100644
--- a/crates/ra_syntax/test_data/parser/ok/0019_enums.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0019_enums.txt
@@ -86,10 +86,10 @@ SOURCE_FILE@[0; 182)
         NAME@[101; 102)
           IDENT@[101; 102) "C"
         WHITESPACE@[102; 103) " "
-        NAMED_FIELD_DEF_LIST@[103; 146)
+        RECORD_FIELD_DEF_LIST@[103; 146)
           L_CURLY@[103; 104) "{"
           WHITESPACE@[104; 113) "\n        "
-          NAMED_FIELD_DEF@[113; 119)
+          RECORD_FIELD_DEF@[113; 119)
             NAME@[113; 114)
               IDENT@[113; 114) "a"
             COLON@[114; 115) ":"
@@ -101,7 +101,7 @@ SOURCE_FILE@[0; 182)
                     IDENT@[116; 119) "u32"
           COMMA@[119; 120) ","
           WHITESPACE@[120; 129) "\n        "
-          NAMED_FIELD_DEF@[129; 139)
+          RECORD_FIELD_DEF@[129; 139)
             VISIBILITY@[129; 132)
               PUB_KW@[129; 132) "pub"
             WHITESPACE@[132; 133) " "
@@ -123,7 +123,7 @@ SOURCE_FILE@[0; 182)
         NAME@[152; 153)
           IDENT@[152; 153) "F"
         WHITESPACE@[153; 154) " "
-        NAMED_FIELD_DEF_LIST@[154; 156)
+        RECORD_FIELD_DEF_LIST@[154; 156)
           L_CURLY@[154; 155) "{"
           R_CURLY@[155; 156) "}"
       COMMA@[156; 157) ","
@@ -131,9 +131,9 @@ SOURCE_FILE@[0; 182)
       ENUM_VARIANT@[162; 169)
         NAME@[162; 163)
           IDENT@[162; 163) "D"
-        POS_FIELD_DEF_LIST@[163; 169)
+        TUPLE_FIELD_DEF_LIST@[163; 169)
           L_PAREN@[163; 164) "("
-          POS_FIELD_DEF@[164; 167)
+          TUPLE_FIELD_DEF@[164; 167)
             PATH_TYPE@[164; 167)
               PATH@[164; 167)
                 PATH_SEGMENT@[164; 167)
@@ -146,7 +146,7 @@ SOURCE_FILE@[0; 182)
       ENUM_VARIANT@[175; 178)
         NAME@[175; 176)
           IDENT@[175; 176) "E"
-        POS_FIELD_DEF_LIST@[176; 178)
+        TUPLE_FIELD_DEF_LIST@[176; 178)
           L_PAREN@[176; 177) "("
           R_PAREN@[177; 178) ")"
       COMMA@[178; 179) ","
diff --git a/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.txt b/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.txt
index c89b591e9..c13ebfe37 100644
--- a/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.txt
@@ -1564,10 +1564,10 @@ SOURCE_FILE@[0; 3813)
             LIFETIME@[2863; 2869) "\'union"
           R_ANGLE@[2869; 2870) ">"
         WHITESPACE@[2870; 2871) " "
-        NAMED_FIELD_DEF_LIST@[2871; 2904)
+        RECORD_FIELD_DEF_LIST@[2871; 2904)
           L_CURLY@[2871; 2872) "{"
           WHITESPACE@[2872; 2873) " "
-          NAMED_FIELD_DEF@[2873; 2901)
+          RECORD_FIELD_DEF@[2873; 2901)
             NAME@[2873; 2878)
               IDENT@[2873; 2878) "union"
             COLON@[2878; 2879) ":"
diff --git a/crates/ra_syntax/test_data/parser/ok/0040_raw_struct_item_field.txt b/crates/ra_syntax/test_data/parser/ok/0040_raw_struct_item_field.txt
index 3c717555d..05f2c656f 100644
--- a/crates/ra_syntax/test_data/parser/ok/0040_raw_struct_item_field.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0040_raw_struct_item_field.txt
@@ -5,10 +5,10 @@ SOURCE_FILE@[0; 27)
     NAME@[7; 8)
       IDENT@[7; 8) "S"
     WHITESPACE@[8; 9) " "
-    NAMED_FIELD_DEF_LIST@[9; 27)
+    RECORD_FIELD_DEF_LIST@[9; 27)
       L_CURLY@[9; 10) "{"
       WHITESPACE@[10; 15) "\n    "
-      NAMED_FIELD_DEF@[15; 25)
+      RECORD_FIELD_DEF@[15; 25)
         NAME@[15; 20)
           IDENT@[15; 20) "r#foo"
         COLON@[20; 21) ":"
diff --git a/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.txt b/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.txt
index ef47521bf..1f2456afa 100644
--- a/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.txt
@@ -7,10 +7,10 @@ SOURCE_FILE@[0; 160)
     NAME@[69; 73)
       IDENT@[69; 73) "Repr"
     WHITESPACE@[73; 74) " "
-    NAMED_FIELD_DEF_LIST@[74; 90)
+    RECORD_FIELD_DEF_LIST@[74; 90)
       L_CURLY@[74; 75) "{"
       WHITESPACE@[75; 76) " "
-      NAMED_FIELD_DEF@[76; 88)
+      RECORD_FIELD_DEF@[76; 88)
         NAME@[76; 79)
           IDENT@[76; 79) "raw"
         COLON@[79; 80) ":"
@@ -46,16 +46,16 @@ SOURCE_FILE@[0; 160)
         BIN_EXPR@[107; 135)
           INDEX_EXPR@[107; 131)
             FIELD_EXPR@[107; 128)
-              STRUCT_LIT@[107; 124)
+              RECORD_LIT@[107; 124)
                 PATH@[107; 111)
                   PATH_SEGMENT@[107; 111)
                     NAME_REF@[107; 111)
                       IDENT@[107; 111) "Repr"
                 WHITESPACE@[111; 112) " "
-                NAMED_FIELD_LIST@[112; 124)
+                RECORD_FIELD_LIST@[112; 124)
                   L_CURLY@[112; 113) "{"
                   WHITESPACE@[113; 114) " "
-                  NAMED_FIELD@[114; 122)
+                  RECORD_FIELD@[114; 122)
                     NAME_REF@[114; 117)
                       IDENT@[114; 117) "raw"
                     COLON@[117; 118) ":"
@@ -83,14 +83,14 @@ SOURCE_FILE@[0; 160)
       WHITESPACE@[136; 141) "\n    "
       EXPR_STMT@[141; 157)
         CALL_EXPR@[141; 156)
-          STRUCT_LIT@[141; 154)
+          RECORD_LIT@[141; 154)
             PATH@[141; 145)
               PATH_SEGMENT@[141; 145)
                 NAME_REF@[141; 145)
                   IDENT@[141; 145) "Repr"
-            NAMED_FIELD_LIST@[145; 154)
+            RECORD_FIELD_LIST@[145; 154)
               L_CURLY@[145; 146) "{"
-              NAMED_FIELD@[146; 153)
+              RECORD_FIELD@[146; 153)
                 NAME_REF@[146; 149)
                   IDENT@[146; 149) "raw"
                 COLON@[149; 150) ":"
diff --git a/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.txt b/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.txt
index 917b50ddf..136e2aae1 100644
--- a/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.txt
@@ -268,9 +268,9 @@ SOURCE_FILE@[0; 395)
       ENUM_VARIANT@[356; 365)
         NAME@[356; 357)
           IDENT@[356; 357) "B"
-        POS_FIELD_DEF_LIST@[357; 365)
+        TUPLE_FIELD_DEF_LIST@[357; 365)
           L_PAREN@[357; 358) "("
-          POS_FIELD_DEF@[358; 360)
+          TUPLE_FIELD_DEF@[358; 360)
             PATH_TYPE@[358; 360)
               PATH@[358; 360)
                 PATH_SEGMENT@[358; 360)
@@ -278,7 +278,7 @@ SOURCE_FILE@[0; 395)
                     IDENT@[358; 360) "i8"
           COMMA@[360; 361) ","
           WHITESPACE@[361; 362) " "
-          POS_FIELD_DEF@[362; 364)
+          TUPLE_FIELD_DEF@[362; 364)
             PATH_TYPE@[362; 364)
               PATH@[362; 364)
                 PATH_SEGMENT@[362; 364)