WIP

Author: amandasystems

compiler/rustc_borrowck/src/handle_placeholders.rs

@@ -339,13 +339,12 @@ pub(crate) fn compute_sccs_applying_placeholder_outlives_constraints<'tcx>(
     let (definitions, has_placeholders) = region_definitions(universal_regions, infcx);
 
     let MirTypeckRegionConstraints {
-        placeholder_indices: _,
-        placeholder_index_to_region: _,
         liveness_constraints,
         mut outlives_constraints,
         mut member_constraints,
         universe_causes,
         type_tests,
+        ..
     } = constraints;
 
     if let Some(guar) = universal_regions.tainted_by_errors() {

compiler/rustc_borrowck/src/type_check/mod.rs

@@ -238,14 +238,14 @@ pub(crate) struct MirTypeckResults<'tcx> {
 pub(crate) struct MirTypeckRegionConstraints<'tcx> {
     /// Maps from a `ty::Placeholder` to the corresponding
     /// `PlaceholderIndex` bit that we will use for it.
-    pub placeholder_indices: PlaceholderIndices,
+    placeholder_indices: PlaceholderIndices,
 
     /// Each time we add a placeholder to `placeholder_indices`, we
     /// also create a corresponding "representative" region vid for
     /// that wraps it. This vector tracks those. This way, when we
     /// convert the same `ty::RePlaceholder(p)` twice, we can map to
     /// the same underlying `RegionVid`.
-    pub placeholder_index_to_region: IndexVec<PlaceholderIndex, ty::Region<'tcx>>,
+    placeholder_index_to_region: IndexVec<PlaceholderIndex, ty::Region<'tcx>>,
 
     /// In general, the type-checker is not responsible for enforcing
     /// liveness constraints; this job falls to the region inferencer,