aboutsummaryrefslogtreecommitdiff
path: root/crates
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2021-03-23 09:49:55 +0000
committerAleksey Kladov <[email protected]>2021-03-23 09:49:55 +0000
commit45a8f37b6ae230db6c30c013f17d8aebac98a5e1 (patch)
treeddd1d23321319816f932551c0d8b0c42e590e40b /crates
parent4b997b86633b1c0ca134d89e8236d285422c04e3 (diff)
Compute more mathematically well-rounded notion of transitive deps
By including the crate itself, we make the resulting set closed with respect to `transitve_reveres_dependencies` operation, as it becomes a proper transitive closure. This just feels more proper and mathy. And, indeed, this actually allows us to simplify call sites somewhat.
Diffstat (limited to 'crates')
-rw-r--r--crates/base_db/src/input.rs4
-rw-r--r--crates/hir/src/lib.rs3
-rw-r--r--crates/ide_db/src/search.rs4
3 files changed, 5 insertions, 6 deletions
diff --git a/crates/base_db/src/input.rs b/crates/base_db/src/input.rs
index e9e8dfc2e..248ab1de2 100644
--- a/crates/base_db/src/input.rs
+++ b/crates/base_db/src/input.rs
@@ -274,13 +274,15 @@ impl CrateGraph {
274 deps.into_iter() 274 deps.into_iter()
275 } 275 }
276 276
277 /// Returns an iterator over all transitive reverse dependencies of the given crate. 277 /// Returns all transitive reverse dependencies of the given crate,
278 /// including the crate itself.
278 pub fn transitive_reverse_dependencies( 279 pub fn transitive_reverse_dependencies(
279 &self, 280 &self,
280 of: CrateId, 281 of: CrateId,
281 ) -> impl Iterator<Item = CrateId> + '_ { 282 ) -> impl Iterator<Item = CrateId> + '_ {
282 let mut worklist = vec![of]; 283 let mut worklist = vec![of];
283 let mut rev_deps = FxHashSet::default(); 284 let mut rev_deps = FxHashSet::default();
285 rev_deps.insert(of);
284 let mut inverted_graph = FxHashMap::<_, Vec<_>>::default(); 286 let mut inverted_graph = FxHashMap::<_, Vec<_>>::default();
285 self.arena.iter().for_each(|(&krate, data)| { 287 self.arena.iter().for_each(|(&krate, data)| {
286 data.dependencies 288 data.dependencies
diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs
index 30b96d7e2..aefebde06 100644
--- a/crates/hir/src/lib.rs
+++ b/crates/hir/src/lib.rs
@@ -1572,8 +1572,7 @@ impl Impl {
1572 pub fn all_for_trait(db: &dyn HirDatabase, trait_: Trait) -> Vec<Impl> { 1572 pub fn all_for_trait(db: &dyn HirDatabase, trait_: Trait) -> Vec<Impl> {
1573 let krate = trait_.module(db).krate(); 1573 let krate = trait_.module(db).krate();
1574 let mut all = Vec::new(); 1574 let mut all = Vec::new();
1575 for Crate { id } in krate.transitive_reverse_dependencies(db).into_iter().chain(Some(krate)) 1575 for Crate { id } in krate.transitive_reverse_dependencies(db).into_iter() {
1576 {
1577 let impls = db.trait_impls_in_crate(id); 1576 let impls = db.trait_impls_in_crate(id);
1578 all.extend(impls.for_trait(trait_.id).map(Self::from)) 1577 all.extend(impls.for_trait(trait_.id).map(Self::from))
1579 } 1578 }
diff --git a/crates/ide_db/src/search.rs b/crates/ide_db/src/search.rs
index 324817cd0..8e93de277 100644
--- a/crates/ide_db/src/search.rs
+++ b/crates/ide_db/src/search.rs
@@ -245,9 +245,7 @@ impl Definition {
245 } 245 }
246 246
247 if let Some(Visibility::Public) = vis { 247 if let Some(Visibility::Public) = vis {
248 let source_root_id = db.file_source_root(file_id); 248 let mut res = FxHashMap::default();
249 let source_root = db.source_root(source_root_id);
250 let mut res = source_root.iter().map(|id| (id, None)).collect::<FxHashMap<_, _>>();
251 249
252 let krate = module.krate(); 250 let krate = module.krate();
253 for rev_dep in krate.transitive_reverse_dependencies(db) { 251 for rev_dep in krate.transitive_reverse_dependencies(db) {