w

Author: lcnr

compiler/rustc_hir_typeck/src/expr.rs

@@ -2326,7 +2326,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                     let fn_sig = self.tcx.fn_sig(item.def_id).skip_binder();
                     let ret_ty = fn_sig.output();
                     let ret_ty = self.tcx.normalize_erasing_late_bound_regions(
-                        self.infcx.typing_env(self.param_env),
+                        self.typing_env(self.param_env),
                         ret_ty,
                     );
                     if !self.can_eq(self.param_env, ret_ty, adt_ty) {

compiler/rustc_hir_typeck/src/intrinsicck.rs

@@ -46,7 +46,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
         let span = tcx.hir().span(hir_id);
         let normalize = |ty| {
             let ty = self.resolve_vars_if_possible(ty);
-            self.tcx.normalize_erasing_regions(self.infcx.typing_env(self.param_env), ty)
+            self.tcx.normalize_erasing_regions(self.typing_env(self.param_env), ty)
         };
         let from = normalize(from);
         let to = normalize(to);