diff options
Diffstat (limited to 'crates/ra_hir_def/src/lib.rs')
-rw-r--r-- | crates/ra_hir_def/src/lib.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crates/ra_hir_def/src/lib.rs b/crates/ra_hir_def/src/lib.rs index 2d27bbdf8..518772e8a 100644 --- a/crates/ra_hir_def/src/lib.rs +++ b/crates/ra_hir_def/src/lib.rs | |||
@@ -133,12 +133,12 @@ pub struct EnumVariantId { | |||
133 | pub type LocalEnumVariantId = Idx<adt::EnumVariantData>; | 133 | pub type LocalEnumVariantId = Idx<adt::EnumVariantData>; |
134 | 134 | ||
135 | #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] | 135 | #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] |
136 | pub struct StructFieldId { | 136 | pub struct FieldId { |
137 | pub parent: VariantId, | 137 | pub parent: VariantId, |
138 | pub local_id: LocalStructFieldId, | 138 | pub local_id: LocalFieldId, |
139 | } | 139 | } |
140 | 140 | ||
141 | pub type LocalStructFieldId = Idx<adt::StructFieldData>; | 141 | pub type LocalFieldId = Idx<adt::FieldData>; |
142 | 142 | ||
143 | #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] | 143 | #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] |
144 | pub struct ConstId(salsa::InternId); | 144 | pub struct ConstId(salsa::InternId); |
@@ -299,7 +299,7 @@ impl From<AssocItemId> for GenericDefId { | |||
299 | #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)] | 299 | #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)] |
300 | pub enum AttrDefId { | 300 | pub enum AttrDefId { |
301 | ModuleId(ModuleId), | 301 | ModuleId(ModuleId), |
302 | StructFieldId(StructFieldId), | 302 | FieldId(FieldId), |
303 | AdtId(AdtId), | 303 | AdtId(AdtId), |
304 | FunctionId(FunctionId), | 304 | FunctionId(FunctionId), |
305 | EnumVariantId(EnumVariantId), | 305 | EnumVariantId(EnumVariantId), |
@@ -313,7 +313,7 @@ pub enum AttrDefId { | |||
313 | 313 | ||
314 | impl_froms!( | 314 | impl_froms!( |
315 | AttrDefId: ModuleId, | 315 | AttrDefId: ModuleId, |
316 | StructFieldId, | 316 | FieldId, |
317 | AdtId(StructId, EnumId, UnionId), | 317 | AdtId(StructId, EnumId, UnionId), |
318 | EnumVariantId, | 318 | EnumVariantId, |
319 | StaticId, | 319 | StaticId, |