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,
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)]
#[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<Arc<LangItems>>;
-
#[salsa::invoke(LangItems::crate_lang_items_query)]
fn crate_lang_items(&self, krate: CrateId) -> Arc<LangItems>;
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)]
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<Arc<LangItems>> {
- 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
.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<T>(
&mut self,
db: &dyn DefDatabase,