diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-03-18 20:54:24 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2021-03-18 20:54:24 +0000 |
commit | 5e82d3172282e159e539569b80b3135c17b972f0 (patch) | |
tree | a2ad2b6faf8c708fc593546df64d489c117b61f2 /crates/hir_ty/src/infer/unify.rs | |
parent | b70bea0d7994cbe7b1e01e6b2e0f4ab3ac2c6fd5 (diff) | |
parent | 7a7e47eab7323a8e122d9994b2936e50e42a1af2 (diff) |
Merge #8096
8096: Chalkify TraitRef r=flodiebold a=flodiebold
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/hir_ty/src/infer/unify.rs b/crates/hir_ty/src/infer/unify.rs index b2d4f67b3..f5ea09698 100644 --- a/crates/hir_ty/src/infer/unify.rs +++ b/crates/hir_ty/src/infer/unify.rs | |||
@@ -390,9 +390,9 @@ impl InferenceTable { | |||
390 | ) -> bool { | 390 | ) -> bool { |
391 | match (pred1, pred2) { | 391 | match (pred1, pred2) { |
392 | (GenericPredicate::Implemented(tr1), GenericPredicate::Implemented(tr2)) | 392 | (GenericPredicate::Implemented(tr1), GenericPredicate::Implemented(tr2)) |
393 | if tr1.trait_ == tr2.trait_ => | 393 | if tr1.trait_id == tr2.trait_id => |
394 | { | 394 | { |
395 | self.unify_substs(&tr1.substs, &tr2.substs, depth + 1) | 395 | self.unify_substs(&tr1.substitution, &tr2.substitution, depth + 1) |
396 | } | 396 | } |
397 | (GenericPredicate::Projection(proj1), GenericPredicate::Projection(proj2)) | 397 | (GenericPredicate::Projection(proj1), GenericPredicate::Projection(proj2)) |
398 | if proj1.projection_ty.associated_ty_id == proj2.projection_ty.associated_ty_id => | 398 | if proj1.projection_ty.associated_ty_id == proj2.projection_ty.associated_ty_id => |