mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't recursively call impls_from_deps

Browse Source 
It creates a big map and duplicates lots of impls that are then left
lying around
This commit is contained in:
Jonas Schievink 2020-07-01 15:19:36 +02:00
parent 63ea8f2af0
commit 07ba986db7
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
crates/ra_hir_ty/src/method_resolution.rs
View File

@ -72,13 +72,8 @@ impl CrateImplDefs {
impls_by_trait: FxHashMap::default(),
};
// For each dependency, calculate `impls_from_deps` recursively, then add its own
// `impls_in_crate`.
// As we might visit crates multiple times, `merge` has to deduplicate impls to avoid
// wasting memory.
for dep in &crate_graph[krate].dependencies {
res.merge(&db.impls_from_deps(dep.crate_id));
res.merge(&db.impls_in_crate(dep.crate_id));
for krate in crate_graph.transitive_deps(krate) {
res.merge(&db.impls_in_crate(krate));
}
Arc::new(res)
@ -114,8 +109,6 @@ impl CrateImplDefs {
for (fp, impls) in &other.inherent_impls {
let vec = self.inherent_impls.entry(*fp).or_default();
vec.extend(impls);
vec.sort();
vec.dedup();
}
for (trait_, other_map) in &other.impls_by_trait {
@ -123,8 +116,6 @@ impl CrateImplDefs {
for (fp, impls) in other_map {
let vec = map.entry(*fp).or_default();
vec.extend(impls);
vec.sort();
vec.dedup();
}
}
}