language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-30 05:45:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Allow calling dyn trait super trait methods without the super trait in scope

Browse source 
This also removes some vestiges of the old impl trait support which I think
aren't currently in use.
This commit is contained in:
Florian Diebold 2020-05-16 18:32:15 +02:00
parent 9322790066
commit 811d25b723
3 changed files with 40 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/ra_hir_ty/src/method_resolution.rs
View file

@ -408,8 +408,9 @@ fn iterate_trait_method_candidates<T>(
receiver_ty: Option<&Canonical<Ty>>,
mut callback: impl FnMut(&Ty, AssocItemId) -> Option<T>,
) -> Option<T> {
// if ty is `impl Trait` or `dyn Trait`, the trait doesn't need to be in scope
let inherent_trait = self_ty.value.inherent_trait().into_iter();
// if ty is `dyn Trait`, the trait doesn't need to be in scope
let inherent_trait =
self_ty.value.dyn_trait().into_iter().flat_map(|t| all_super_traits(db.upcast(), t));
let env_traits = if let Ty::Placeholder(_) = self_ty.value {
// if we have `T: Trait` in the param env, the trait doesn't need to be in scope
env.trait_predicates_for_self_ty(&self_ty.value)
@ -601,11 +602,6 @@ pub fn implements_trait(
krate: CrateId,
trait_: TraitId,
) -> bool {
if ty.value.inherent_trait() == Some(trait_) {
// FIXME this is a bit of a hack, since Chalk should say the same thing
// anyway, but currently Chalk doesn't implement `dyn/impl Trait` yet
return true;
}
let goal = generic_implements_goal(db, env, trait_, ty.clone());
let solution = db.trait_solve(krate, goal);