bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/hir-ty/src/method_resolution.rs')
-rw-r--r--crates/hir-ty/src/method_resolution.rs90
1 files changed, 50 insertions, 40 deletions
diff --git a/crates/hir-ty/src/method_resolution.rs b/crates/hir-ty/src/method_resolution.rs
index 33619edfee..06df30582a 100644
--- a/crates/hir-ty/src/method_resolution.rs
+++ b/crates/hir-ty/src/method_resolution.rs
@@ -132,34 +132,40 @@ pub(crate) const ALL_FLOAT_FPS: [TyFingerprint; 2] = [
TyFingerprint::Scalar(Scalar::Float(FloatTy::F64)),
];
+type TraitFpMap = FxHashMap<TraitId, FxHashMap<Option<TyFingerprint>, Box<[ImplId]>>>;
+type TraitFpMapCollector = FxHashMap<TraitId, FxHashMap<Option<TyFingerprint>, Vec<ImplId>>>;
+
/// Trait impls defined or available in some crate.
#[derive(Debug, Eq, PartialEq)]
pub struct TraitImpls {
// If the `Option<TyFingerprint>` is `None`, the impl may apply to any self type.
- map: FxHashMap<TraitId, FxHashMap<Option<TyFingerprint>, Vec<ImplId>>>,
+ map: TraitFpMap,
}
impl TraitImpls {
pub(crate) fn trait_impls_in_crate_query(db: &dyn HirDatabase, krate: CrateId) -> Arc<Self> {
let _p = profile::span("trait_impls_in_crate_query").detail(|| format!("{krate:?}"));
- let mut impls = Self { map: FxHashMap::default() };
+ let mut impls = FxHashMap::default();
- let crate_def_map = db.crate_def_map(krate);
- impls.collect_def_map(db, &crate_def_map);
- impls.shrink_to_fit();
+ Self::collect_def_map(db, &mut impls, &db.crate_def_map(krate));
- Arc::new(impls)
+ Arc::new(Self::finish(impls))
}
- pub(crate) fn trait_impls_in_block_query(db: &dyn HirDatabase, block: BlockId) -> Arc<Self> {
+ pub(crate) fn trait_impls_in_block_query(
+ db: &dyn HirDatabase,
+ block: BlockId,
+ ) -> Option<Arc<Self>> {
let _p = profile::span("trait_impls_in_block_query");
- let mut impls = Self { map: FxHashMap::default() };
+ let mut impls = FxHashMap::default();
- let block_def_map = db.block_def_map(block);
- impls.collect_def_map(db, &block_def_map);
- impls.shrink_to_fit();
+ Self::collect_def_map(db, &mut impls, &db.block_def_map(block));
- Arc::new(impls)
+ if impls.is_empty() {
+ None
+ } else {
+ Some(Arc::new(Self::finish(impls)))
+ }
}
pub(crate) fn trait_impls_in_deps_query(
@@ -174,15 +180,16 @@ impl TraitImpls {
)
}
- fn shrink_to_fit(&mut self) {
- self.map.shrink_to_fit();
- self.map.values_mut().for_each(|map| {
- map.shrink_to_fit();
- map.values_mut().for_each(Vec::shrink_to_fit);
- });
+ fn finish(map: TraitFpMapCollector) -> TraitImpls {
+ TraitImpls {
+ map: map
+ .into_iter()
+ .map(|(k, v)| (k, v.into_iter().map(|(k, v)| (k, v.into_boxed_slice())).collect()))
+ .collect(),
+ }
}
- fn collect_def_map(&mut self, db: &dyn HirDatabase, def_map: &DefMap) {
+ fn collect_def_map(db: &dyn HirDatabase, map: &mut TraitFpMapCollector, def_map: &DefMap) {
for (_module_id, module_data) in def_map.modules() {
for impl_id in module_data.scope.impls() {
// Reservation impls should be ignored during trait resolution, so we never need
@@ -200,12 +207,7 @@ impl TraitImpls {
};
let self_ty = db.impl_self_ty(impl_id);
let self_ty_fp = TyFingerprint::for_trait_impl(self_ty.skip_binders());
- self.map
- .entry(target_trait)
- .or_default()
- .entry(self_ty_fp)
- .or_default()
- .push(impl_id);
+ map.entry(target_trait).or_default().entry(self_ty_fp).or_default().push(impl_id);
}
// To better support custom derives, collect impls in all unnamed const items.
@@ -213,7 +215,7 @@ impl TraitImpls {
for konst in collect_unnamed_consts(db, &module_data.scope) {
let body = db.body(konst.into());
for (_, block_def_map) in body.blocks(db.upcast()) {
- self.collect_def_map(db, &block_def_map);
+ Self::collect_def_map(db, map, &block_def_map);
}
}
}
@@ -281,7 +283,10 @@ impl InherentImpls {
Arc::new(impls)
}
- pub(crate) fn inherent_impls_in_block_query(db: &dyn HirDatabase, block: BlockId) -> Arc<Self> {
+ pub(crate) fn inherent_impls_in_block_query(
+ db: &dyn HirDatabase,
+ block: BlockId,
+ ) -> Option<Arc<Self>> {
let _p = profile::span("inherent_impls_in_block_query");
let mut impls = Self { map: FxHashMap::default(), invalid_impls: Vec::default() };
@@ -289,7 +294,11 @@ impl InherentImpls {
impls.collect_def_map(db, &block_def_map);
impls.shrink_to_fit();
- Arc::new(impls)
+ if impls.map.is_empty() && impls.invalid_impls.is_empty() {
+ None
+ } else {
+ Some(Arc::new(impls))
+ }
}
fn shrink_to_fit(&mut self) {
@@ -737,7 +746,7 @@ fn lookup_impl_assoc_item_for_trait_ref(
let impls = db.trait_impls_in_deps(env.krate);
let self_impls = match self_ty.kind(Interner) {
TyKind::Adt(id, _) => {
- id.0.module(db.upcast()).containing_block().map(|it| db.trait_impls_in_block(it))
+ id.0.module(db.upcast()).containing_block().and_then(|it| db.trait_impls_in_block(it))
}
_ => None,
};
@@ -1254,17 +1263,18 @@ fn iterate_inherent_methods(
};
while let Some(block_id) = block {
- let impls = db.inherent_impls_in_block(block_id);
- impls_for_self_ty(
- &impls,
- self_ty,
- table,
- name,
- receiver_ty,
- receiver_adjustments.clone(),
- module,
- callback,
- )?;
+ if let Some(impls) = db.inherent_impls_in_block(block_id) {
+ impls_for_self_ty(
+ &impls,
+ self_ty,
+ table,
+ name,
+ receiver_ty,
+ receiver_adjustments.clone(),
+ module,
+ callback,
+ )?;
+ }
block = db.block_def_map(block_id).parent().and_then(|module| module.containing_block());
}