diff options
Diffstat (limited to 'crates/ra_hir/src/from_id.rs')
-rw-r--r-- | crates/ra_hir/src/from_id.rs | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/crates/ra_hir/src/from_id.rs b/crates/ra_hir/src/from_id.rs index 62fb52e72..679ae8121 100644 --- a/crates/ra_hir/src/from_id.rs +++ b/crates/ra_hir/src/from_id.rs | |||
@@ -4,13 +4,13 @@ | |||
4 | //! are splitting the hir. | 4 | //! are splitting the hir. |
5 | 5 | ||
6 | use hir_def::{ | 6 | use hir_def::{ |
7 | expr::PatId, AdtId, AssocItemId, AttrDefId, DefWithBodyId, EnumVariantId, GenericDefId, | 7 | expr::PatId, AdtId, AssocItemId, AttrDefId, DefWithBodyId, EnumVariantId, FieldId, |
8 | ModuleDefId, StructFieldId, VariantId, | 8 | GenericDefId, ModuleDefId, VariantId, |
9 | }; | 9 | }; |
10 | 10 | ||
11 | use crate::{ | 11 | use crate::{ |
12 | code_model::ItemInNs, Adt, AssocItem, AttrDef, DefWithBody, EnumVariant, GenericDef, Local, | 12 | code_model::ItemInNs, Adt, AssocItem, AttrDef, DefWithBody, EnumVariant, Field, GenericDef, |
13 | MacroDef, ModuleDef, StructField, VariantDef, | 13 | Local, MacroDef, ModuleDef, VariantDef, |
14 | }; | 14 | }; |
15 | 15 | ||
16 | macro_rules! from_id { | 16 | macro_rules! from_id { |
@@ -184,15 +184,15 @@ impl From<VariantDef> for VariantId { | |||
184 | } | 184 | } |
185 | } | 185 | } |
186 | 186 | ||
187 | impl From<StructField> for StructFieldId { | 187 | impl From<Field> for FieldId { |
188 | fn from(def: StructField) -> Self { | 188 | fn from(def: Field) -> Self { |
189 | StructFieldId { parent: def.parent.into(), local_id: def.id } | 189 | FieldId { parent: def.parent.into(), local_id: def.id } |
190 | } | 190 | } |
191 | } | 191 | } |
192 | 192 | ||
193 | impl From<StructFieldId> for StructField { | 193 | impl From<FieldId> for Field { |
194 | fn from(def: StructFieldId) -> Self { | 194 | fn from(def: FieldId) -> Self { |
195 | StructField { parent: def.parent.into(), id: def.local_id } | 195 | Field { parent: def.parent.into(), id: def.local_id } |
196 | } | 196 | } |
197 | } | 197 | } |
198 | 198 | ||
@@ -200,7 +200,7 @@ impl From<AttrDef> for AttrDefId { | |||
200 | fn from(def: AttrDef) -> Self { | 200 | fn from(def: AttrDef) -> Self { |
201 | match def { | 201 | match def { |
202 | AttrDef::Module(it) => AttrDefId::ModuleId(it.id), | 202 | AttrDef::Module(it) => AttrDefId::ModuleId(it.id), |
203 | AttrDef::StructField(it) => AttrDefId::StructFieldId(it.into()), | 203 | AttrDef::Field(it) => AttrDefId::FieldId(it.into()), |
204 | AttrDef::Adt(it) => AttrDefId::AdtId(it.into()), | 204 | AttrDef::Adt(it) => AttrDefId::AdtId(it.into()), |
205 | AttrDef::Function(it) => AttrDefId::FunctionId(it.id), | 205 | AttrDef::Function(it) => AttrDefId::FunctionId(it.id), |
206 | AttrDef::EnumVariant(it) => AttrDefId::EnumVariantId(it.into()), | 206 | AttrDef::EnumVariant(it) => AttrDefId::EnumVariantId(it.into()), |