diff options
Diffstat (limited to 'crates/hir/src/from_id.rs')
-rw-r--r-- | crates/hir/src/from_id.rs | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/crates/hir/src/from_id.rs b/crates/hir/src/from_id.rs index 8d0f84508..8e0c571b8 100644 --- a/crates/hir/src/from_id.rs +++ b/crates/hir/src/from_id.rs | |||
@@ -9,8 +9,7 @@ use hir_def::{ | |||
9 | }; | 9 | }; |
10 | 10 | ||
11 | use crate::{ | 11 | use crate::{ |
12 | Adt, AssocItem, DefWithBody, EnumVariant, Field, GenericDef, Local, MacroDef, ModuleDef, | 12 | Adt, AssocItem, DefWithBody, Field, GenericDef, Local, MacroDef, ModuleDef, Variant, VariantDef, |
13 | VariantDef, | ||
14 | }; | 13 | }; |
15 | 14 | ||
16 | macro_rules! from_id { | 15 | macro_rules! from_id { |
@@ -65,14 +64,14 @@ impl From<Adt> for AdtId { | |||
65 | } | 64 | } |
66 | } | 65 | } |
67 | 66 | ||
68 | impl From<EnumVariantId> for EnumVariant { | 67 | impl From<EnumVariantId> for Variant { |
69 | fn from(id: EnumVariantId) -> Self { | 68 | fn from(id: EnumVariantId) -> Self { |
70 | EnumVariant { parent: id.parent.into(), id: id.local_id } | 69 | Variant { parent: id.parent.into(), id: id.local_id } |
71 | } | 70 | } |
72 | } | 71 | } |
73 | 72 | ||
74 | impl From<EnumVariant> for EnumVariantId { | 73 | impl From<Variant> for EnumVariantId { |
75 | fn from(def: EnumVariant) -> Self { | 74 | fn from(def: Variant) -> Self { |
76 | EnumVariantId { parent: def.parent.id, local_id: def.id } | 75 | EnumVariantId { parent: def.parent.id, local_id: def.id } |
77 | } | 76 | } |
78 | } | 77 | } |
@@ -83,7 +82,7 @@ impl From<ModuleDefId> for ModuleDef { | |||
83 | ModuleDefId::ModuleId(it) => ModuleDef::Module(it.into()), | 82 | ModuleDefId::ModuleId(it) => ModuleDef::Module(it.into()), |
84 | ModuleDefId::FunctionId(it) => ModuleDef::Function(it.into()), | 83 | ModuleDefId::FunctionId(it) => ModuleDef::Function(it.into()), |
85 | ModuleDefId::AdtId(it) => ModuleDef::Adt(it.into()), | 84 | ModuleDefId::AdtId(it) => ModuleDef::Adt(it.into()), |
86 | ModuleDefId::EnumVariantId(it) => ModuleDef::EnumVariant(it.into()), | 85 | ModuleDefId::EnumVariantId(it) => ModuleDef::Variant(it.into()), |
87 | ModuleDefId::ConstId(it) => ModuleDef::Const(it.into()), | 86 | ModuleDefId::ConstId(it) => ModuleDef::Const(it.into()), |
88 | ModuleDefId::StaticId(it) => ModuleDef::Static(it.into()), | 87 | ModuleDefId::StaticId(it) => ModuleDef::Static(it.into()), |
89 | ModuleDefId::TraitId(it) => ModuleDef::Trait(it.into()), | 88 | ModuleDefId::TraitId(it) => ModuleDef::Trait(it.into()), |
@@ -99,7 +98,7 @@ impl From<ModuleDef> for ModuleDefId { | |||
99 | ModuleDef::Module(it) => ModuleDefId::ModuleId(it.into()), | 98 | ModuleDef::Module(it) => ModuleDefId::ModuleId(it.into()), |
100 | ModuleDef::Function(it) => ModuleDefId::FunctionId(it.into()), | 99 | ModuleDef::Function(it) => ModuleDefId::FunctionId(it.into()), |
101 | ModuleDef::Adt(it) => ModuleDefId::AdtId(it.into()), | 100 | ModuleDef::Adt(it) => ModuleDefId::AdtId(it.into()), |
102 | ModuleDef::EnumVariant(it) => ModuleDefId::EnumVariantId(it.into()), | 101 | ModuleDef::Variant(it) => ModuleDefId::EnumVariantId(it.into()), |
103 | ModuleDef::Const(it) => ModuleDefId::ConstId(it.into()), | 102 | ModuleDef::Const(it) => ModuleDefId::ConstId(it.into()), |
104 | ModuleDef::Static(it) => ModuleDefId::StaticId(it.into()), | 103 | ModuleDef::Static(it) => ModuleDefId::StaticId(it.into()), |
105 | ModuleDef::Trait(it) => ModuleDefId::TraitId(it.into()), | 104 | ModuleDef::Trait(it) => ModuleDefId::TraitId(it.into()), |
@@ -147,7 +146,7 @@ impl From<GenericDef> for GenericDefId { | |||
147 | GenericDef::Trait(it) => GenericDefId::TraitId(it.id), | 146 | GenericDef::Trait(it) => GenericDefId::TraitId(it.id), |
148 | GenericDef::TypeAlias(it) => GenericDefId::TypeAliasId(it.id), | 147 | GenericDef::TypeAlias(it) => GenericDefId::TypeAliasId(it.id), |
149 | GenericDef::Impl(it) => GenericDefId::ImplId(it.id), | 148 | GenericDef::Impl(it) => GenericDefId::ImplId(it.id), |
150 | GenericDef::EnumVariant(it) => { | 149 | GenericDef::Variant(it) => { |
151 | GenericDefId::EnumVariantId(EnumVariantId { parent: it.parent.id, local_id: it.id }) | 150 | GenericDefId::EnumVariantId(EnumVariantId { parent: it.parent.id, local_id: it.id }) |
152 | } | 151 | } |
153 | GenericDef::Const(it) => GenericDefId::ConstId(it.id), | 152 | GenericDef::Const(it) => GenericDefId::ConstId(it.id), |
@@ -164,7 +163,7 @@ impl From<GenericDefId> for GenericDef { | |||
164 | GenericDefId::TypeAliasId(it) => GenericDef::TypeAlias(it.into()), | 163 | GenericDefId::TypeAliasId(it) => GenericDef::TypeAlias(it.into()), |
165 | GenericDefId::ImplId(it) => GenericDef::Impl(it.into()), | 164 | GenericDefId::ImplId(it) => GenericDef::Impl(it.into()), |
166 | GenericDefId::EnumVariantId(it) => { | 165 | GenericDefId::EnumVariantId(it) => { |
167 | GenericDef::EnumVariant(EnumVariant { parent: it.parent.into(), id: it.local_id }) | 166 | GenericDef::Variant(Variant { parent: it.parent.into(), id: it.local_id }) |
168 | } | 167 | } |
169 | GenericDefId::ConstId(it) => GenericDef::Const(it.into()), | 168 | GenericDefId::ConstId(it) => GenericDef::Const(it.into()), |
170 | } | 169 | } |
@@ -185,7 +184,7 @@ impl From<VariantId> for VariantDef { | |||
185 | fn from(def: VariantId) -> Self { | 184 | fn from(def: VariantId) -> Self { |
186 | match def { | 185 | match def { |
187 | VariantId::StructId(it) => VariantDef::Struct(it.into()), | 186 | VariantId::StructId(it) => VariantDef::Struct(it.into()), |
188 | VariantId::EnumVariantId(it) => VariantDef::EnumVariant(it.into()), | 187 | VariantId::EnumVariantId(it) => VariantDef::Variant(it.into()), |
189 | VariantId::UnionId(it) => VariantDef::Union(it.into()), | 188 | VariantId::UnionId(it) => VariantDef::Union(it.into()), |
190 | } | 189 | } |
191 | } | 190 | } |
@@ -195,7 +194,7 @@ impl From<VariantDef> for VariantId { | |||
195 | fn from(def: VariantDef) -> Self { | 194 | fn from(def: VariantDef) -> Self { |
196 | match def { | 195 | match def { |
197 | VariantDef::Struct(it) => VariantId::StructId(it.id), | 196 | VariantDef::Struct(it) => VariantId::StructId(it.id), |
198 | VariantDef::EnumVariant(it) => VariantId::EnumVariantId(it.into()), | 197 | VariantDef::Variant(it) => VariantId::EnumVariantId(it.into()), |
199 | VariantDef::Union(it) => VariantId::UnionId(it.id), | 198 | VariantDef::Union(it) => VariantId::UnionId(it.id), |
200 | } | 199 | } |
201 | } | 200 | } |