Work around the clones

Author: amandasystems

compiler/rustc_borrowck/src/consumers.rs

@@ -94,7 +94,7 @@ pub struct BodyWithBorrowckFacts<'tcx> {
     /// [`calculate_borrows_out_of_scope_at_location`].
     pub region_inference_context: RegionInferenceContext<'tcx>,
     /// The inferred region values. These are included because they
-    /// are necesssary as input to
+    /// are necessary as input to
     /// [`calculate_borrows_out_of_scope_at_location`].
     pub inferred_regions: InferredRegions<'tcx>,
     /// The table that maps Polonius points to locations in the table.

compiler/rustc_borrowck/src/nll.rs

@@ -21,7 +21,9 @@ use tracing::{debug, instrument};
 use crate::borrow_set::BorrowSet;
 use crate::consumers::RustcFacts;
 use crate::diagnostics::RegionErrors;
-use crate::handle_placeholders::compute_sccs_applying_placeholder_outlives_constraints;
+use crate::handle_placeholders::{
+    LoweredConstraints, compute_sccs_applying_placeholder_outlives_constraints,
+};
 use crate::polonius::legacy::{
     PoloniusFacts, PoloniusFactsExt, PoloniusLocationTable, PoloniusOutput,
 };
@@ -92,17 +94,30 @@ pub(crate) fn compute_closure_requirements_modulo_opaques<'tcx>(
 ) -> Option<ClosureRegionRequirements<'tcx>> {
     // FIXME(#146079): we shouldn't have to clone all this stuff here.
     // Computing the region graph should take at least some of it by reference/`Rc`.
-    let lowered_constraints = compute_sccs_applying_placeholder_outlives_constraints(
+    let LoweredConstraints {
+        constraint_sccs,
+        definitions,
+        scc_annotations,
+        outlives_constraints,
+        type_tests,
+        liveness_constraints,
+        universe_causes,
+        placeholder_indices,
+    } = compute_sccs_applying_placeholder_outlives_constraints(
         constraints.clone(),
         &universal_region_relations,
         infcx,
     );
 
-    let placeholder_indices = lowered_constraints.placeholder_indices.clone(); // FIXME!!!
-
     let regioncx = RegionInferenceContext::new(
         &infcx,
-        lowered_constraints,
+        constraint_sccs,
+        definitions,
+        scc_annotations,
+        outlives_constraints,
+        type_tests,
+        liveness_constraints,
+        universe_causes,
         universal_region_relations.clone(),
     );
 
@@ -148,10 +163,28 @@ pub(crate) fn compute_regions<'tcx>(
         &lowered_constraints,
     );
 
-    let placeholder_indices = lowered_constraints.placeholder_indices.clone();
-
-    let mut regioncx =
-        RegionInferenceContext::new(infcx, lowered_constraints, universal_region_relations);
+    let LoweredConstraints {
+        constraint_sccs,
+        definitions,
+        scc_annotations,
+        outlives_constraints,
+        type_tests,
+        liveness_constraints,
+        universe_causes,
+        placeholder_indices,
+    } = lowered_constraints;
+
+    let mut regioncx = RegionInferenceContext::new(
+        &infcx,
+        constraint_sccs,
+        definitions,
+        scc_annotations,
+        outlives_constraints,
+        type_tests,
+        liveness_constraints,
+        universe_causes,
+        universal_region_relations,
+    );
 
     // If requested for `-Zpolonius=next`, convert NLL constraints to localized outlives constraints
     // and use them to compute loan liveness.

compiler/rustc_borrowck/src/region_infer/mod.rs

@@ -26,7 +26,7 @@ use crate::constraints::graph::NormalConstraintGraph;
 use crate::constraints::{ConstraintSccIndex, OutlivesConstraint, OutlivesConstraintSet};
 use crate::dataflow::BorrowIndex;
 use crate::diagnostics::{RegionErrorKind, RegionErrors, UniverseInfo};
-use crate::handle_placeholders::{LoweredConstraints, RegionTracker};
+use crate::handle_placeholders::RegionTracker;
 use crate::polonius::LiveLoans;
 use crate::polonius::legacy::PoloniusOutput;
 use crate::region_infer::values::{
@@ -312,23 +312,17 @@ impl<'tcx> RegionInferenceContext<'tcx> {
     /// of constraints produced by the MIR type check.
     pub(crate) fn new(
         infcx: &BorrowckInferCtxt<'tcx>,
-        lowered_constraints: LoweredConstraints<'tcx>,
+        constraint_sccs: Sccs<RegionVid, ConstraintSccIndex>,
+        definitions: Frozen<IndexVec<RegionVid, RegionDefinition<'tcx>>>,
+        scc_annotations: IndexVec<ConstraintSccIndex, RegionTracker>,
+        outlives_constraints: Frozen<OutlivesConstraintSet<'tcx>>,
+        type_tests: Vec<TypeTest<'tcx>>,
+        mut liveness_constraints: LivenessValues,
+        universe_causes: FxIndexMap<UniverseIndex, UniverseInfo<'tcx>>,
         universal_region_relations: Frozen<UniversalRegionRelations<'tcx>>,
     ) -> Self {
-        let LoweredConstraints {
-            constraint_sccs,
-            definitions,
-            outlives_constraints,
-            scc_annotations,
-            type_tests,
-            mut liveness_constraints,
-            universe_causes,
-            placeholder_indices,
-        } = lowered_constraints;
-
         debug!("universal_regions: {:#?}", universal_region_relations.universal_regions);
         debug!("outlives constraints: {:#?}", outlives_constraints);
-        debug!("placeholder_indices: {:#?}", placeholder_indices);
         debug!("type tests: {:#?}", type_tests);
 
         let constraint_graph = Frozen::freeze(outlives_constraints.graph(definitions.len()));