rename struct field -> struct field data

diff --git a/crates/ra_hir/src/adt.rs b/crates/ra_hir/src/adt.rs
index dc936e826ae4f7a7f4e795fa8d4228aa62be6104..2579ece199ce9a206f754ee3ae78b012b154d723 100644 (file)
--- a/crates/ra_hir/src/adt.rs
+++ b/crates/ra_hir/src/adt.rs
@@ -118,7 +118,7 @@ pub struct EnumVariantData {
 
 /// A single field of an enum variant or struct
 #[derive(Debug, Clone, PartialEq, Eq)]
-pub struct StructField {
+pub struct StructFieldData {
     pub(crate) name: Name,
     pub(crate) type_ref: TypeRef,
 }
@@ -126,13 +126,13 @@ pub struct StructField {
 /// Fields of an enum variant or struct
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum VariantData {
-    Struct(Vec<StructField>),
-    Tuple(Vec<StructField>),
+    Struct(Vec<StructFieldData>),
+    Tuple(Vec<StructFieldData>),
     Unit,
 }
 
 impl VariantData {
-    pub fn fields(&self) -> &[StructField] {
+    pub fn fields(&self) -> &[StructFieldData] {
         match self {
             VariantData::Struct(fields) | VariantData::Tuple(fields) => fields,
             _ => &[],
@@ -168,7 +168,7 @@ fn new(flavor: StructFlavor) -> Self {
                 let fields = fl
                     .fields()
                     .enumerate()
-                    .map(|(i, fd)| StructField {
+                    .map(|(i, fd)| StructFieldData {
                         name: Name::tuple_field_name(i),
                         type_ref: TypeRef::from_ast_opt(fd.type_ref()),
                     })
@@ -178,7 +178,7 @@ fn new(flavor: StructFlavor) -> Self {
             StructFlavor::Named(fl) => {
                 let fields = fl
                     .fields()
-                    .map(|fd| StructField {
+                    .map(|fd| StructFieldData {
                         name: fd.name().map(|n| n.as_name()).unwrap_or_else(Name::missing),
                         type_ref: TypeRef::from_ast_opt(fd.type_ref()),
                     })