From 6c782a53148dc2f34be2eafbdf872ab6497632fd Mon Sep 17 00:00:00 2001 From: Lukas Wirth Date: Mon, 15 Mar 2021 10:11:48 +0100 Subject: Power up goto_implementation by allowing it to be invoked on references of names, showing all (trait) implementations of the given type in all crates including builtin types --- crates/hir/src/lib.rs | 53 ++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 40 insertions(+), 13 deletions(-) (limited to 'crates/hir') diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs index eb1cd66fb..a9d3c9156 100644 --- a/crates/hir/src/lib.rs +++ b/crates/hir/src/lib.rs @@ -696,8 +696,8 @@ impl Adt { } } - pub fn krate(self, db: &dyn HirDatabase) -> Option { - Some(self.module(db).krate()) + pub fn krate(self, db: &dyn HirDatabase) -> Crate { + self.module(db).krate() } pub fn name(self, db: &dyn HirDatabase) -> Name { @@ -1019,8 +1019,8 @@ impl TypeAlias { Module { id: self.id.lookup(db.upcast()).module(db.upcast()) } } - pub fn krate(self, db: &dyn HirDatabase) -> Option { - Some(self.module(db).krate()) + pub fn krate(self, db: &dyn HirDatabase) -> Crate { + self.module(db).krate() } pub fn type_ref(self, db: &dyn HirDatabase) -> Option { @@ -1483,9 +1483,42 @@ impl Impl { inherent.all_impls().chain(trait_.all_impls()).map(Self::from).collect() } - pub fn for_trait(db: &dyn HirDatabase, krate: Crate, trait_: Trait) -> Vec { - let impls = db.trait_impls_in_crate(krate.id); - impls.for_trait(trait_.id).map(Self::from).collect() + + pub fn all_for_type(db: &dyn HirDatabase, Type { krate, ty }: Type) -> Vec { + let def_crates = match ty.value.def_crates(db, krate) { + Some(def_crates) => def_crates, + None => return vec![], + }; + + let filter = |impl_def: &Impl| { + let target_ty = impl_def.target_ty(db); + let rref = target_ty.remove_ref(); + ty.value.equals_ctor(rref.as_ref().map_or(&target_ty.ty.value, |it| &it.ty.value)) + }; + + let mut all = Vec::new(); + def_crates.iter().for_each(|&id| { + all.extend(db.inherent_impls_in_crate(id).all_impls().map(Self::from).filter(filter)) + }); + for id in def_crates + .iter() + .flat_map(|&id| Crate { id }.reverse_dependencies(db)) + .map(|Crate { id }| id) + .chain(def_crates.iter().copied()) + { + all.extend(db.trait_impls_in_crate(id).all_impls().map(Self::from).filter(filter)); + } + all + } + + pub fn all_for_trait(db: &dyn HirDatabase, trait_: Trait) -> Vec { + let krate = trait_.module(db).krate(); + let mut all = Vec::new(); + for Crate { id } in krate.reverse_dependencies(db).into_iter().chain(Some(krate)) { + let impls = db.trait_impls_in_crate(id); + all.extend(impls.for_trait(trait_.id).map(Self::from)) + } + all } // FIXME: the return type is wrong. This should be a hir version of @@ -1913,12 +1946,6 @@ impl Type { self.ty.value.associated_type_parent_trait(db).map(Into::into) } - // FIXME: provide required accessors such that it becomes implementable from outside. - pub fn is_equal_for_find_impls(&self, other: &Type) -> bool { - let rref = other.remove_ref(); - self.ty.value.equals_ctor(rref.as_ref().map_or(&other.ty.value, |it| &it.ty.value)) - } - fn derived(&self, ty: Ty) -> Type { Type { krate: self.krate, -- cgit v1.2.3 From 6241567948b644739d2ae904e74f5f10cd5b2bb6 Mon Sep 17 00:00:00 2001 From: Lukas Wirth Date: Mon, 15 Mar 2021 13:49:21 +0100 Subject: Speedup trait impl search for goto_implementation --- crates/hir/src/lib.rs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'crates/hir') diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs index a9d3c9156..42a805c57 100644 --- a/crates/hir/src/lib.rs +++ b/crates/hir/src/lib.rs @@ -51,7 +51,8 @@ use hir_expand::{diagnostics::DiagnosticSink, name::name, MacroDefKind}; use hir_ty::{ autoderef, display::{write_bounds_like_dyn_trait_with_prefix, HirDisplayError, HirFormatter}, - method_resolution, to_assoc_type_id, + method_resolution::{self, TyFingerprint}, + to_assoc_type_id, traits::{FnTrait, Solution, SolutionVariables}, AliasTy, BoundVar, CallableDefId, CallableSig, Canonical, DebruijnIndex, GenericPredicate, InEnvironment, Interner, Obligation, ProjectionPredicate, ProjectionTy, Scalar, Substs, Ty, @@ -1500,13 +1501,20 @@ impl Impl { def_crates.iter().for_each(|&id| { all.extend(db.inherent_impls_in_crate(id).all_impls().map(Self::from).filter(filter)) }); + let fp = TyFingerprint::for_impl(&ty.value); for id in def_crates .iter() .flat_map(|&id| Crate { id }.reverse_dependencies(db)) .map(|Crate { id }| id) .chain(def_crates.iter().copied()) { - all.extend(db.trait_impls_in_crate(id).all_impls().map(Self::from).filter(filter)); + match fp { + Some(fp) => all.extend( + db.trait_impls_in_crate(id).for_self_ty(fp).map(Self::from).filter(filter), + ), + None => all + .extend(db.trait_impls_in_crate(id).all_impls().map(Self::from).filter(filter)), + } } all } -- cgit v1.2.3 From 79561b9d2e901e2624f94ffa7bc6017f0249f23d Mon Sep 17 00:00:00 2001 From: Lukas Wirth Date: Mon, 15 Mar 2021 14:31:55 +0100 Subject: goto_implementation: Look at the entire crate graph for trait impls --- crates/hir/src/lib.rs | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'crates/hir') diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs index 42a805c57..d13b4d5fd 100644 --- a/crates/hir/src/lib.rs +++ b/crates/hir/src/lib.rs @@ -1488,7 +1488,7 @@ impl Impl { pub fn all_for_type(db: &dyn HirDatabase, Type { krate, ty }: Type) -> Vec { let def_crates = match ty.value.def_crates(db, krate) { Some(def_crates) => def_crates, - None => return vec![], + None => return Vec::new(), }; let filter = |impl_def: &Impl| { @@ -1498,16 +1498,11 @@ impl Impl { }; let mut all = Vec::new(); - def_crates.iter().for_each(|&id| { + def_crates.into_iter().for_each(|id| { all.extend(db.inherent_impls_in_crate(id).all_impls().map(Self::from).filter(filter)) }); let fp = TyFingerprint::for_impl(&ty.value); - for id in def_crates - .iter() - .flat_map(|&id| Crate { id }.reverse_dependencies(db)) - .map(|Crate { id }| id) - .chain(def_crates.iter().copied()) - { + for id in db.crate_graph().iter() { match fp { Some(fp) => all.extend( db.trait_impls_in_crate(id).for_self_ty(fp).map(Self::from).filter(filter), -- cgit v1.2.3