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

Exclude methods from non-parameter types introduced by generic constraints

Browse source
This commit is contained in:
Laurențiu Nicola 2020-02-18 13:26:00 +02:00
parent 20252efb32
commit 5b05209744
2 changed files with 34 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -377,12 +377,17 @@ fn iterate_trait_method_candidates<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 we have `T: Trait` in the param env, the trait doesn't need to be in scope
let traits_from_env = env
.trait_predicates_for_self_ty(&self_ty.value)
.map(|tr| tr.trait_)
.flat_map(|t| all_super_traits(db, t));
let traits = inherent_trait.chain(traits_from_env).chain(traits_in_scope.iter().copied());
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)
.map(|tr| tr.trait_)
.flat_map(|t| all_super_traits(db, t))
.collect()
} else {
Vec::new()
};
let traits =
inherent_trait.chain(env_traits.into_iter()).chain(traits_in_scope.iter().copied());
'traits: for t in traits {
let data = db.trait_data(t);