language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-02 06:41:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Lookup super traits in is_dyn_method

Browse source
This commit is contained in:
hkalbasi 2023-07-20 15:43:42 +03:30
parent eb143383c3
commit ed8e1fd472
2 changed files with 42 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

22
crates/hir-ty/src/method_resolution.rs
View file

@ -665,13 +665,21 @@ pub fn is_dyn_method(
};
let self_ty = trait_ref.self_type_parameter(Interner);
if let TyKind::Dyn(d) = self_ty.kind(Interner) {
let is_my_trait_in_bounds =
d.bounds.skip_binders().as_slice(Interner).iter().any(|it| match it.skip_binders() {
// rustc doesn't accept `impl Foo<2> for dyn Foo<5>`, so if the trait id is equal, no matter
// what the generics are, we are sure that the method is come from the vtable.
WhereClause::Implemented(tr) => tr.trait_id == trait_ref.trait_id,
_ => false,
});
let is_my_trait_in_bounds = d
.bounds
.skip_binders()
.as_slice(Interner)
.iter()
.map(|it| it.skip_binders())
.flat_map(|it| match it {
WhereClause::Implemented(tr) => {
all_super_traits(db.upcast(), from_chalk_trait_id(tr.trait_id))
}
_ => smallvec![],
})
// rustc doesn't accept `impl Foo<2> for dyn Foo<5>`, so if the trait id is equal, no matter
// what the generics are, we are sure that the method is come from the vtable.
.any(|x| x == trait_id);
if is_my_trait_in_bounds {
return Some(fn_params);
}