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.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.rs')
-rw-r--r-- | crates/hir_ty/src/infer.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/hir_ty/src/infer.rs b/crates/hir_ty/src/infer.rs index 8cf59821f..fbfedb4e6 100644 --- a/crates/hir_ty/src/infer.rs +++ b/crates/hir_ty/src/infer.rs | |||
@@ -385,8 +385,8 @@ impl<'a> InferenceContext<'a> { | |||
385 | let projection = ProjectionPredicate { | 385 | let projection = ProjectionPredicate { |
386 | ty: ty.clone(), | 386 | ty: ty.clone(), |
387 | projection_ty: ProjectionTy { | 387 | projection_ty: ProjectionTy { |
388 | associated_ty: to_assoc_type_id(res_assoc_ty), | 388 | associated_ty_id: to_assoc_type_id(res_assoc_ty), |
389 | parameters: substs, | 389 | substitution: substs, |
390 | }, | 390 | }, |
391 | }; | 391 | }; |
392 | self.obligations.push(Obligation::Trait(trait_ref)); | 392 | self.obligations.push(Obligation::Trait(trait_ref)); |