diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-03-14 15:34:37 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2021-03-14 15:34:37 +0000 |
commit | 406e4be04c2e74d58bcaa7e823e2509d1a7803d4 (patch) | |
tree | 79dcaa50fe38214d03c4e60b3738ca578e09d659 /crates/hir_ty/src/infer/unify.rs | |
parent | f57e2f55984758a83644b852a4cc47e0b27945df (diff) | |
parent | 195414783402d6973f4e673e84be9b7bc19cbfa6 (diff) |
Merge #8016
8016: More Chalk adaptations r=flodiebold a=flodiebold
- rename a bunch of fields
- use `chalk_ir::FnSig`
Co-authored-by: Florian Diebold <[email protected]>
Diffstat (limited to 'crates/hir_ty/src/infer/unify.rs')
-rw-r--r-- | crates/hir_ty/src/infer/unify.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/hir_ty/src/infer/unify.rs b/crates/hir_ty/src/infer/unify.rs index 16d89ed1b..ebc612ca9 100644 --- a/crates/hir_ty/src/infer/unify.rs +++ b/crates/hir_ty/src/infer/unify.rs | |||
@@ -381,11 +381,11 @@ impl InferenceTable { | |||
381 | self.unify_substs(&tr1.substs, &tr2.substs, depth + 1) | 381 | self.unify_substs(&tr1.substs, &tr2.substs, depth + 1) |
382 | } | 382 | } |
383 | (GenericPredicate::Projection(proj1), GenericPredicate::Projection(proj2)) | 383 | (GenericPredicate::Projection(proj1), GenericPredicate::Projection(proj2)) |
384 | if proj1.projection_ty.associated_ty == proj2.projection_ty.associated_ty => | 384 | if proj1.projection_ty.associated_ty_id == proj2.projection_ty.associated_ty_id => |
385 | { | 385 | { |
386 | self.unify_substs( | 386 | self.unify_substs( |
387 | &proj1.projection_ty.parameters, | 387 | &proj1.projection_ty.substitution, |
388 | &proj2.projection_ty.parameters, | 388 | &proj2.projection_ty.substitution, |
389 | depth + 1, | 389 | depth + 1, |
390 | ) && self.unify_inner(&proj1.ty, &proj2.ty, depth + 1) | 390 | ) && self.unify_inner(&proj1.ty, &proj2.ty, depth + 1) |
391 | } | 391 | } |