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

Fix #3373

Browse source 
Basically, we need to allow variables in the caller self type to unify with the
impl's declared self type. That requires some more contortions in the variable
handling. I'm looking forward to (hopefully) handling this in a cleaner way when
we switch to Chalk's types and unification code.
This commit is contained in:
Florian Diebold 2020-03-01 14:31:35 +01:00
parent 6db2da4993
commit 336a3c6121
4 changed files with 45 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -508,10 +508,17 @@ pub(crate) fn inherent_impl_substs(
impl_id: ImplId,
self_ty: &Canonical<Ty>,
) -> Option<Substs> {
let vars = Substs::build_for_def(db, impl_id).fill_with_bound_vars(0).build();
// we create a var for each type parameter of the impl; we need to keep in
// mind here that `self_ty` might have vars of its own
let vars =
Substs::build_for_def(db, impl_id).fill_with_bound_vars(self_ty.num_vars as u32).build();
let self_ty_with_vars = db.impl_self_ty(impl_id).subst(&vars);
let self_ty_with_vars = Canonical { num_vars: vars.len(), value: self_ty_with_vars };
super::infer::unify(&self_ty_with_vars, self_ty)
let self_ty_with_vars =
Canonical { num_vars: vars.len() + self_ty.num_vars, value: self_ty_with_vars };
let substs = super::infer::unify(&self_ty_with_vars, self_ty);
// we only want the substs for the vars we added, not the ones from self_ty
let result = substs.map(|s| s.suffix(vars.len()));
result
}
fn transform_receiver_ty(