diff options
Diffstat (limited to 'crates/hir_ty/src/infer/expr.rs')
-rw-r--r-- | crates/hir_ty/src/infer/expr.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/hir_ty/src/infer/expr.rs b/crates/hir_ty/src/infer/expr.rs index eee3e6ec5..55163c963 100644 --- a/crates/hir_ty/src/infer/expr.rs +++ b/crates/hir_ty/src/infer/expr.rs | |||
@@ -99,8 +99,8 @@ impl<'a> InferenceContext<'a> { | |||
99 | if self.db.trait_solve(krate, goal.value).is_some() { | 99 | if self.db.trait_solve(krate, goal.value).is_some() { |
100 | self.obligations.push(implements_fn_trait); | 100 | self.obligations.push(implements_fn_trait); |
101 | let output_proj_ty = crate::ProjectionTy { | 101 | let output_proj_ty = crate::ProjectionTy { |
102 | associated_ty: to_assoc_type_id(output_assoc_type), | 102 | associated_ty_id: to_assoc_type_id(output_assoc_type), |
103 | parameters: substs, | 103 | substitution: substs, |
104 | }; | 104 | }; |
105 | let return_ty = self.normalize_projection_ty(output_proj_ty); | 105 | let return_ty = self.normalize_projection_ty(output_proj_ty); |
106 | Some((arg_tys, return_ty)) | 106 | Some((arg_tys, return_ty)) |
@@ -261,7 +261,7 @@ impl<'a> InferenceContext<'a> { | |||
261 | sig_tys.push(ret_ty.clone()); | 261 | sig_tys.push(ret_ty.clone()); |
262 | let sig_ty = TyKind::Function(FnPointer { | 262 | let sig_ty = TyKind::Function(FnPointer { |
263 | num_args: sig_tys.len() - 1, | 263 | num_args: sig_tys.len() - 1, |
264 | sig: FnSig { variadic: false }, | 264 | sig: FnSig { abi: (), safety: chalk_ir::Safety::Safe, variadic: false }, |
265 | substs: Substs(sig_tys.clone().into()), | 265 | substs: Substs(sig_tys.clone().into()), |
266 | }) | 266 | }) |
267 | .intern(&Interner); | 267 | .intern(&Interner); |