aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir/src/ids.rs
diff options
context:
space:
mode:
Diffstat (limited to 'crates/ra_hir/src/ids.rs')
-rw-r--r--crates/ra_hir/src/ids.rs15
1 files changed, 1 insertions, 14 deletions
diff --git a/crates/ra_hir/src/ids.rs b/crates/ra_hir/src/ids.rs
index b125a1518..5272656ec 100644
--- a/crates/ra_hir/src/ids.rs
+++ b/crates/ra_hir/src/ids.rs
@@ -18,7 +18,6 @@ pub struct HirInterner {
18 fns: LocationIntener<ItemLoc<ast::FnDef>, FunctionId>, 18 fns: LocationIntener<ItemLoc<ast::FnDef>, FunctionId>,
19 structs: LocationIntener<ItemLoc<ast::StructDef>, StructId>, 19 structs: LocationIntener<ItemLoc<ast::StructDef>, StructId>,
20 enums: LocationIntener<ItemLoc<ast::EnumDef>, EnumId>, 20 enums: LocationIntener<ItemLoc<ast::EnumDef>, EnumId>,
21 enum_variants: LocationIntener<ItemLoc<ast::EnumVariant>, EnumVariantId>,
22 consts: LocationIntener<ItemLoc<ast::ConstDef>, ConstId>, 21 consts: LocationIntener<ItemLoc<ast::ConstDef>, ConstId>,
23 statics: LocationIntener<ItemLoc<ast::StaticDef>, StaticId>, 22 statics: LocationIntener<ItemLoc<ast::StaticDef>, StaticId>,
24 traits: LocationIntener<ItemLoc<ast::TraitDef>, TraitId>, 23 traits: LocationIntener<ItemLoc<ast::TraitDef>, TraitId>,
@@ -31,7 +30,6 @@ impl HirInterner {
31 + self.fns.len() 30 + self.fns.len()
32 + self.structs.len() 31 + self.structs.len()
33 + self.enums.len() 32 + self.enums.len()
34 + self.enum_variants.len()
35 + self.consts.len() 33 + self.consts.len()
36 + self.statics.len() 34 + self.statics.len()
37 + self.traits.len() 35 + self.traits.len()
@@ -262,15 +260,6 @@ impl AstItemDef<ast::EnumDef> for EnumId {
262} 260}
263 261
264#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] 262#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
265pub struct EnumVariantId(RawId);
266impl_arena_id!(EnumVariantId);
267impl AstItemDef<ast::EnumVariant> for EnumVariantId {
268 fn interner(interner: &HirInterner) -> &LocationIntener<ItemLoc<ast::EnumVariant>, Self> {
269 &interner.enum_variants
270 }
271}
272
273#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
274pub struct ConstId(RawId); 263pub struct ConstId(RawId);
275impl_arena_id!(ConstId); 264impl_arena_id!(ConstId);
276impl AstItemDef<ast::ConstDef> for ConstId { 265impl AstItemDef<ast::ConstDef> for ConstId {
@@ -342,9 +331,7 @@ impl SourceFileItems {
342 // change parent's id. This means that, say, adding a new function to a 331 // change parent's id. This means that, say, adding a new function to a
343 // trait does not chage ids of top-level items, which helps caching. 332 // trait does not chage ids of top-level items, which helps caching.
344 bfs(source_file.syntax(), |it| { 333 bfs(source_file.syntax(), |it| {
345 if let Some(enum_variant) = ast::EnumVariant::cast(it) { 334 if let Some(module_item) = ast::ModuleItem::cast(it) {
346 self.alloc(enum_variant.syntax().to_owned());
347 } else if let Some(module_item) = ast::ModuleItem::cast(it) {
348 self.alloc(module_item.syntax().to_owned()); 335 self.alloc(module_item.syntax().to_owned());
349 } else if let Some(macro_call) = ast::MacroCall::cast(it) { 336 } else if let Some(macro_call) = ast::MacroCall::cast(it) {
350 self.alloc(macro_call.syntax().to_owned()); 337 self.alloc(macro_call.syntax().to_owned());