Borrowck cleanups part trois

compiler/rustc_borrowck/src/nll.rs

@@ -26,7 +26,7 @@ use crate::polonius::PoloniusContext;
 use crate::polonius::legacy::{
     PoloniusFacts, PoloniusFactsExt, PoloniusLocationTable, PoloniusOutput,
 };
-use crate::region_infer::{RegionInferenceContext, UnsolvedRegionInferenceContext};
+use crate::region_infer::RegionInferenceContext;
 use crate::type_check::MirTypeckRegionConstraints;
 use crate::type_check::free_region_relations::UniversalRegionRelations;
 use crate::universal_regions::UniversalRegions;
@@ -96,14 +96,15 @@ pub(crate) fn compute_closure_requirements_modulo_opaques<'tcx>(
         &universal_region_relations,
         infcx,
     );
-    let regioncx = UnsolvedRegionInferenceContext::new(
+    let (_, closure_region_requirements, _nll_errors) = RegionInferenceContext::solve(
         &infcx,
         lowered_constraints,
         universal_region_relations.clone(),
         location_map,
+        body,
+        None,
     );
 
-    let (_, closure_region_requirements, _nll_errors) = regioncx.solve(infcx, body, None);
     closure_region_requirements
 }
 
@@ -182,17 +183,16 @@ pub(crate) fn compute_regions<'tcx>(
         }
     });
 
-    let regioncx = UnsolvedRegionInferenceContext::new(
+    // Solve the region constraints.
+    let (regioncx, closure_region_requirements, nll_errors) = RegionInferenceContext::solve(
         infcx,
         lowered_constraints,
         universal_region_relations,
         location_map,
+        body,
+        polonius_output.clone(),
     );
 
-    // Solve the region constraints.
-    let (regioncx, closure_region_requirements, nll_errors) =
-        regioncx.solve(infcx, body, polonius_output.clone());
-
     NllOutput {
         regioncx,
         polonius_input: polonius_facts.map(Box::new),

compiler/rustc_borrowck/src/region_infer/dump_mir.rs

@@ -68,7 +68,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
         with_msg: &mut dyn FnMut(&str) -> io::Result<()>,
     ) -> io::Result<()> {
         for region in self.definitions.indices() {
-            let value = self.liveness_constraints.pretty_print_live_points(region);
+            let value = self.liveness_constraints().pretty_print_live_points(region);
             if value != "{}" {
                 with_msg(&format!("{region:?} live at {value}"))?;
             }