5 files changed, 22 insertions, 22 deletions

diff --git a/crates/ra_ide_api/src/completion/complete_dot.rs b/crates/ra_ide_api/src/completion/complete_dot.rs
index d43ff2eec..27256f879 100644
--- a/crates/ra_ide_api/src/completion/complete_dot.rs
+++ b/crates/ra_ide_api/src/completion/complete_dot.rs
@@ -45,7 +45,7 @@ fn complete_fields(acc: &mut Completions, ctx: &CompletionContext, receiver: Ty)
                 // FIXME unions
                 TypeCtor::Tuple { .. } => {
                     for (i, ty) in a_ty.parameters.iter().enumerate() {
-                        acc.add_pos_field(ctx, i, ty);
+                        acc.add_tuple_field(ctx, i, ty);
                     }
                 }
                 _ => {}
diff --git a/crates/ra_ide_api/src/completion/complete_struct_literal.rs b/crates/ra_ide_api/src/completion/complete_record_literal.rs
index 6aa41f498..6b929a8ac 100644
--- a/crates/ra_ide_api/src/completion/complete_struct_literal.rs
+++ b/crates/ra_ide_api/src/completion/complete_record_literal.rs
@@ -3,11 +3,11 @@ use hir::Substs;
 use crate::completion::{CompletionContext, Completions};
 
 /// Complete fields in fields literals.
-pub(super) fn complete_struct_literal(acc: &mut Completions, ctx: &CompletionContext) {
-    let (ty, variant) = match ctx.struct_lit_syntax.as_ref().and_then(|it| {
+pub(super) fn complete_record_literal(acc: &mut Completions, ctx: &CompletionContext) {
+    let (ty, variant) = match ctx.record_lit_syntax.as_ref().and_then(|it| {
         Some((
             ctx.analyzer.type_of(ctx.db, &it.clone().into())?,
-            ctx.analyzer.resolve_struct_literal(it)?,
+            ctx.analyzer.resolve_record_literal(it)?,
         ))
     }) {
         Some(it) => it,
@@ -30,7 +30,7 @@ mod tests {
     }
 
     #[test]
-    fn test_struct_literal_field() {
+    fn test_record_literal_field() {
         let completions = complete(
             r"
             struct A { the_field: u32 }
@@ -54,7 +54,7 @@ mod tests {
     }
 
     #[test]
-    fn test_struct_literal_enum_variant() {
+    fn test_record_literal_enum_variant() {
         let completions = complete(
             r"
             enum E {
@@ -80,7 +80,7 @@ mod tests {
     }
 
     #[test]
-    fn test_struct_literal_two_structs() {
+    fn test_record_literal_two_structs() {
         let completions = complete(
             r"
             struct A { a: u32 }
@@ -106,7 +106,7 @@ mod tests {
     }
 
     #[test]
-    fn test_struct_literal_generic_struct() {
+    fn test_record_literal_generic_struct() {
         let completions = complete(
             r"
             struct A<T> { a: T }
diff --git a/crates/ra_ide_api/src/completion/complete_struct_pattern.rs b/crates/ra_ide_api/src/completion/complete_record_pattern.rs
index d0dde5930..8c8b47ea4 100644
--- a/crates/ra_ide_api/src/completion/complete_struct_pattern.rs
+++ b/crates/ra_ide_api/src/completion/complete_record_pattern.rs
@@ -2,11 +2,11 @@ use hir::Substs;
 
 use crate::completion::{CompletionContext, Completions};
 
-pub(super) fn complete_struct_pattern(acc: &mut Completions, ctx: &CompletionContext) {
-    let (ty, variant) = match ctx.struct_lit_pat.as_ref().and_then(|it| {
+pub(super) fn complete_record_pattern(acc: &mut Completions, ctx: &CompletionContext) {
+    let (ty, variant) = match ctx.record_lit_pat.as_ref().and_then(|it| {
         Some((
             ctx.analyzer.type_of_pat(ctx.db, &it.clone().into())?,
-            ctx.analyzer.resolve_struct_pattern(it)?,
+            ctx.analyzer.resolve_record_pattern(it)?,
         ))
     }) {
         Some(it) => it,
@@ -29,7 +29,7 @@ mod tests {
     }
 
     #[test]
-    fn test_struct_pattern_field() {
+    fn test_record_pattern_field() {
         let completions = complete(
             r"
             struct S { foo: u32 }
@@ -56,7 +56,7 @@ mod tests {
     }
 
     #[test]
-    fn test_struct_pattern_enum_variant() {
+    fn test_record_pattern_enum_variant() {
         let completions = complete(
             r"
             enum E {
diff --git a/crates/ra_ide_api/src/completion/completion_context.rs b/crates/ra_ide_api/src/completion/completion_context.rs
index dfaa9ce69..7139947b3 100644
--- a/crates/ra_ide_api/src/completion/completion_context.rs
+++ b/crates/ra_ide_api/src/completion/completion_context.rs
@@ -20,8 +20,8 @@ pub(crate) struct CompletionContext<'a> {
     pub(super) module: Option<hir::Module>,
     pub(super) function_syntax: Option<ast::FnDef>,
     pub(super) use_item_syntax: Option<ast::UseItem>,
-    pub(super) struct_lit_syntax: Option<ast::StructLit>,
-    pub(super) struct_lit_pat: Option<ast::StructPat>,
+    pub(super) record_lit_syntax: Option<ast::RecordLit>,
+    pub(super) record_lit_pat: Option<ast::RecordPat>,
     pub(super) is_param: bool,
     /// If a name-binding or reference to a const in a pattern.
     /// Irrefutable patterns (like let) are excluded.
@@ -60,8 +60,8 @@ impl<'a> CompletionContext<'a> {
             module,
             function_syntax: None,
             use_item_syntax: None,
-            struct_lit_syntax: None,
-            struct_lit_pat: None,
+            record_lit_syntax: None,
+            record_lit_pat: None,
             is_param: false,
             is_pat_binding: false,
             is_trivial_path: false,
@@ -120,8 +120,8 @@ impl<'a> CompletionContext<'a> {
                 self.is_param = true;
                 return;
             }
-            if name.syntax().ancestors().find_map(ast::FieldPatList::cast).is_some() {
-                self.struct_lit_pat =
+            if name.syntax().ancestors().find_map(ast::RecordFieldPatList::cast).is_some() {
+                self.record_lit_pat =
                     find_node_at_offset(original_parse.tree().syntax(), self.offset);
             }
         }
@@ -129,8 +129,8 @@ impl<'a> CompletionContext<'a> {
 
     fn classify_name_ref(&mut self, original_file: SourceFile, name_ref: ast::NameRef) {
         let name_range = name_ref.syntax().text_range();
-        if name_ref.syntax().parent().and_then(ast::NamedField::cast).is_some() {
-            self.struct_lit_syntax = find_node_at_offset(original_file.syntax(), self.offset);
+        if name_ref.syntax().parent().and_then(ast::RecordField::cast).is_some() {
+            self.record_lit_syntax = find_node_at_offset(original_file.syntax(), self.offset);
         }
 
         let top_node = name_ref
diff --git a/crates/ra_ide_api/src/completion/presentation.rs b/crates/ra_ide_api/src/completion/presentation.rs
index 2b3f98482..147ceda0c 100644
--- a/crates/ra_ide_api/src/completion/presentation.rs
+++ b/crates/ra_ide_api/src/completion/presentation.rs
@@ -28,7 +28,7 @@ impl Completions {
         .add_to(self);
     }
 
-    pub(crate) fn add_pos_field(&mut self, ctx: &CompletionContext, field: usize, ty: &hir::Ty) {
+    pub(crate) fn add_tuple_field(&mut self, ctx: &CompletionContext, field: usize, ty: &hir::Ty) {
         CompletionItem::new(CompletionKind::Reference, ctx.source_range(), field.to_string())
             .kind(CompletionItemKind::Field)
             .detail(ty.display(ctx.db).to_string())