From 21b68a328ca1f8e926f0364727ed105310a573b5 Mon Sep 17 00:00:00 2001 From: Jonas Schievink Date: Thu, 17 Dec 2020 00:26:01 +0100 Subject: Remove `module_lang_items` It isn't used anywhere except in `crate_lang_items`. Remove it to slightly reduce memory usage and simplify the code. --- crates/hir/src/db.rs | 4 +- crates/hir_def/src/db.rs | 7 +--- crates/hir_def/src/lang_item.rs | 77 ++++++++++++++------------------------- crates/ide_db/src/apply_change.rs | 1 - 4 files changed, 32 insertions(+), 57 deletions(-) diff --git a/crates/hir/src/db.rs b/crates/hir/src/db.rs index 8d949b264..d01e1b33d 100644 --- a/crates/hir/src/db.rs +++ b/crates/hir/src/db.rs @@ -6,8 +6,8 @@ pub use hir_def::db::{ FunctionDataQuery, GenericParamsQuery, ImplDataQuery, ImportMapQuery, InternConstQuery, InternDatabase, InternDatabaseStorage, InternEnumQuery, InternFunctionQuery, InternImplQuery, InternStaticQuery, InternStructQuery, InternTraitQuery, InternTypeAliasQuery, InternUnionQuery, - ItemTreeQuery, LangItemQuery, ModuleLangItemsQuery, StaticDataQuery, StructDataQuery, - TraitDataQuery, TypeAliasDataQuery, UnionDataQuery, + ItemTreeQuery, LangItemQuery, StaticDataQuery, StructDataQuery, TraitDataQuery, + TypeAliasDataQuery, UnionDataQuery, }; pub use hir_expand::db::{ AstDatabase, AstDatabaseStorage, AstIdMapQuery, InternEagerExpansionQuery, InternMacroQuery, diff --git a/crates/hir_def/src/db.rs b/crates/hir_def/src/db.rs index 7f250da33..d1a459066 100644 --- a/crates/hir_def/src/db.rs +++ b/crates/hir_def/src/db.rs @@ -16,8 +16,8 @@ use crate::{ lang_item::{LangItemTarget, LangItems}, nameres::CrateDefMap, AttrDefId, ConstId, ConstLoc, DefWithBodyId, EnumId, EnumLoc, FunctionId, FunctionLoc, - GenericDefId, ImplId, ImplLoc, ModuleId, StaticId, StaticLoc, StructId, StructLoc, TraitId, - TraitLoc, TypeAliasId, TypeAliasLoc, UnionId, UnionLoc, + GenericDefId, ImplId, ImplLoc, StaticId, StaticLoc, StructId, StructLoc, TraitId, TraitLoc, + TypeAliasId, TypeAliasLoc, UnionId, UnionLoc, }; #[salsa::query_group(InternDatabaseStorage)] @@ -95,9 +95,6 @@ pub trait DefDatabase: InternDatabase + AstDatabase + Upcast { #[salsa::invoke(Attrs::attrs_query)] fn attrs(&self, def: AttrDefId) -> Attrs; - #[salsa::invoke(LangItems::module_lang_items_query)] - fn module_lang_items(&self, module: ModuleId) -> Option>; - #[salsa::invoke(LangItems::crate_lang_items_query)] fn crate_lang_items(&self, krate: CrateId) -> Arc; diff --git a/crates/hir_def/src/lang_item.rs b/crates/hir_def/src/lang_item.rs index 063eadccb..30188b740 100644 --- a/crates/hir_def/src/lang_item.rs +++ b/crates/hir_def/src/lang_item.rs @@ -8,8 +8,8 @@ use rustc_hash::FxHashMap; use syntax::SmolStr; use crate::{ - db::DefDatabase, AdtId, AttrDefId, CrateId, EnumId, FunctionId, ImplId, ModuleDefId, ModuleId, - StaticId, StructId, TraitId, + db::DefDatabase, AdtId, AttrDefId, CrateId, EnumId, FunctionId, ImplId, ModuleDefId, StaticId, + StructId, TraitId, }; #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] @@ -84,27 +84,34 @@ impl LangItems { let crate_def_map = db.crate_def_map(krate); - crate_def_map - .modules - .iter() - .filter_map(|(local_id, _)| db.module_lang_items(ModuleId { krate, local_id })) - .for_each(|it| lang_items.items.extend(it.items.iter().map(|(k, v)| (k.clone(), *v)))); - - Arc::new(lang_items) - } + for (_, module_data) in crate_def_map.modules.iter() { + for impl_def in module_data.scope.impls() { + lang_items.collect_lang_item(db, impl_def, LangItemTarget::ImplDefId) + } - pub(crate) fn module_lang_items_query( - db: &dyn DefDatabase, - module: ModuleId, - ) -> Option> { - let _p = profile::span("module_lang_items_query"); - let mut lang_items = LangItems::default(); - lang_items.collect_lang_items(db, module); - if lang_items.items.is_empty() { - None - } else { - Some(Arc::new(lang_items)) + for def in module_data.scope.declarations() { + match def { + ModuleDefId::TraitId(trait_) => { + lang_items.collect_lang_item(db, trait_, LangItemTarget::TraitId) + } + ModuleDefId::AdtId(AdtId::EnumId(e)) => { + lang_items.collect_lang_item(db, e, LangItemTarget::EnumId) + } + ModuleDefId::AdtId(AdtId::StructId(s)) => { + lang_items.collect_lang_item(db, s, LangItemTarget::StructId) + } + ModuleDefId::FunctionId(f) => { + lang_items.collect_lang_item(db, f, LangItemTarget::FunctionId) + } + ModuleDefId::StaticId(s) => { + lang_items.collect_lang_item(db, s, LangItemTarget::StaticId) + } + _ => {} + } + } } + + Arc::new(lang_items) } /// Salsa query. Look for a lang item, starting from the specified crate and recursively @@ -126,34 +133,6 @@ impl LangItems { .find_map(|dep| db.lang_item(dep.crate_id, item.clone())) } - fn collect_lang_items(&mut self, db: &dyn DefDatabase, module: ModuleId) { - // Look for impl targets - let def_map = db.crate_def_map(module.krate); - let module_data = &def_map[module.local_id]; - for impl_def in module_data.scope.impls() { - self.collect_lang_item(db, impl_def, LangItemTarget::ImplDefId) - } - - for def in module_data.scope.declarations() { - match def { - ModuleDefId::TraitId(trait_) => { - self.collect_lang_item(db, trait_, LangItemTarget::TraitId) - } - ModuleDefId::AdtId(AdtId::EnumId(e)) => { - self.collect_lang_item(db, e, LangItemTarget::EnumId) - } - ModuleDefId::AdtId(AdtId::StructId(s)) => { - self.collect_lang_item(db, s, LangItemTarget::StructId) - } - ModuleDefId::FunctionId(f) => { - self.collect_lang_item(db, f, LangItemTarget::FunctionId) - } - ModuleDefId::StaticId(s) => self.collect_lang_item(db, s, LangItemTarget::StaticId), - _ => {} - } - } - } - fn collect_lang_item( &mut self, db: &dyn DefDatabase, diff --git a/crates/ide_db/src/apply_change.rs b/crates/ide_db/src/apply_change.rs index e2251f2b7..71c19ed13 100644 --- a/crates/ide_db/src/apply_change.rs +++ b/crates/ide_db/src/apply_change.rs @@ -163,7 +163,6 @@ impl RootDatabase { hir::db::ExprScopesQuery hir::db::GenericParamsQuery hir::db::AttrsQuery - hir::db::ModuleLangItemsQuery hir::db::CrateLangItemsQuery hir::db::LangItemQuery hir::db::ImportMapQuery -- cgit v1.2.3