remove normalize_capture_place

Author: adwinwhite

compiler/rustc_hir_typeck/src/upvar.rs

@@ -49,9 +49,7 @@ use rustc_middle::ty::{
 use rustc_middle::{bug, span_bug};
 use rustc_session::lint;
 use rustc_span::{BytePos, Pos, Span, Symbol, sym};
-use rustc_trait_selection::error_reporting::InferCtxtErrorExt as _;
 use rustc_trait_selection::infer::InferCtxtExt;
-use rustc_trait_selection::solve;
 use tracing::{debug, instrument};
 
 use super::FnCtxt;
@@ -1172,45 +1170,6 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
             );
         }
     }
-    fn normalize_capture_place(&self, span: Span, place: Place<'tcx>) -> Place<'tcx> {
-        let mut place = self.resolve_vars_if_possible(place);
-
-        // In the new solver, types in HIR `Place`s can contain unnormalized aliases,
-        // which can ICE later (e.g. when projecting fields for diagnostics).
-        if self.next_trait_solver() {
-            let cause = self.misc(span);
-            let at = self.at(&cause, self.param_env);
-            match solve::deeply_normalize_with_skipped_universes_and_ambiguous_coroutine_goals(
-                at,
-                Unnormalized::new_wip(place.clone()),
-                vec![],
-            ) {
-                Ok((normalized, goals)) => {
-                    if !goals.is_empty() {
-                        let mut typeck_results = self.typeck_results.borrow_mut();
-                        typeck_results.coroutine_stalled_predicates.extend(
-                            goals
-                                .into_iter()
-                                // FIXME: throwing away the param-env :(
-                                .map(|goal| (goal.predicate, self.misc(span))),
-                        );
-                    }
-                    normalized
-                }
-                Err(errors) => {
-                    let guar = self.infcx.err_ctxt().report_fulfillment_errors(errors);
-                    place.base_ty = Ty::new_error(self.tcx, guar);
-                    for proj in &mut place.projections {
-                        proj.ty = Ty::new_error(self.tcx, guar);
-                    }
-                    place
-                }
-            }
-        } else {
-            // For the old solver we can rely on `normalize` to eagerly normalize aliases.
-            self.normalize(span, Unnormalized::new_wip(place))
-        }
-    }
 
     /// Combines all the reasons for 2229 migrations
     fn compute_2229_migrations_reasons(
@@ -1828,7 +1787,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
 
         // Normalize eagerly when inserting into `capture_information`, so all downstream
         // capture analysis can assume a normalized `Place`.
-        self.normalize_capture_place(self.tcx.hir_span(var_hir_id), place)
+        self.normalize(self.tcx.hir_span(var_hir_id), Unnormalized::new_wip(place))
     }
 
     fn should_log_capture_analysis(&self, closure_def_id: LocalDefId) -> bool {
@@ -2134,7 +2093,7 @@ impl<'a, 'tcx> euv::Delegate<'tcx> for InferBorrowKind<'a, 'tcx> {
         let dummy_capture_kind = ty::UpvarCapture::ByRef(ty::BorrowKind::Immutable);
 
         let span = self.fcx.tcx.hir_span(diag_expr_id);
-        let place = self.fcx.normalize_capture_place(span, place_with_id.place.clone());
+        let place = self.fcx.normalize(span, Unnormalized::new_wip(place_with_id.place.clone()));
 
         let (place, _) = restrict_capture_precision(place, dummy_capture_kind);
 
@@ -2148,7 +2107,7 @@ impl<'a, 'tcx> euv::Delegate<'tcx> for InferBorrowKind<'a, 'tcx> {
         assert_eq!(self.closure_def_id, upvar_id.closure_expr_id);
 
         let span = self.fcx.tcx.hir_span(diag_expr_id);
-        let place = self.fcx.normalize_capture_place(span, place_with_id.place.clone());
+        let place = self.fcx.normalize(span, Unnormalized::new_wip(place_with_id.place.clone()));
 
         self.capture_information.push((
             place,
@@ -2166,7 +2125,7 @@ impl<'a, 'tcx> euv::Delegate<'tcx> for InferBorrowKind<'a, 'tcx> {
         assert_eq!(self.closure_def_id, upvar_id.closure_expr_id);
 
         let span = self.fcx.tcx.hir_span(diag_expr_id);
-        let place = self.fcx.normalize_capture_place(span, place_with_id.place.clone());
+        let place = self.fcx.normalize(span, Unnormalized::new_wip(place_with_id.place.clone()));
 
         self.capture_information.push((
             place,
@@ -2192,7 +2151,7 @@ impl<'a, 'tcx> euv::Delegate<'tcx> for InferBorrowKind<'a, 'tcx> {
         let capture_kind = ty::UpvarCapture::ByRef(bk);
 
         let span = self.fcx.tcx.hir_span(diag_expr_id);
-        let place = self.fcx.normalize_capture_place(span, place_with_id.place.clone());
+        let place = self.fcx.normalize(span, Unnormalized::new_wip(place_with_id.place.clone()));
 
         // We only want repr packed restriction to be applied to reading references into a packed
         // struct, and not when the data is being moved. Therefore we call this method here instead