easy changes in higher_ranked/mod.rs

Author: jyn514

compiler/rustc_infer/src/infer/fudge.rs

@@ -166,16 +166,16 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
     }
 }
 
-pub struct InferenceFudger<'a, 'tcx> {
-    infcx: &'a InferCtxt<'a, 'tcx>,
+pub struct InferenceFudger<'a, 'cx, 'tcx> {
+    infcx: &'a mut InferCtxt<'cx, 'tcx>,
     type_vars: (Range<TyVid>, Vec<TypeVariableOrigin>),
     int_vars: Range<IntVid>,
     float_vars: Range<FloatVid>,
     region_vars: (Range<RegionVid>, Vec<RegionVariableOrigin>),
     const_vars: (Range<ConstVid<'tcx>>, Vec<ConstVariableOrigin>),
 }
 
-impl<'a, 'tcx> TypeFolder<'tcx> for InferenceFudger<'a, 'tcx> {
+impl<'a, 'tcx> TypeFolder<'tcx> for InferenceFudger<'a, '_, 'tcx> {
     fn tcx<'b>(&'b self) -> TyCtxt<'tcx> {
         self.infcx.tcx
     }

compiler/rustc_infer/src/infer/glb.rs

@@ -66,9 +66,10 @@ impl TypeRelation<'tcx> for Glb<'_, 'combine, 'infcx, 'tcx> {
     ) -> RelateResult<'tcx, ty::Region<'tcx>> {
         debug!("{}.regions({:?}, {:?})", self.tag(), a, b);
 
+        let tcx = self.tcx();
         let origin = Subtype(box self.fields.trace.clone());
         Ok(self.fields.infcx.inner.unwrap_region_constraints().glb_regions(
-            self.tcx(),
+            tcx,
             origin,
             a,
             b,
@@ -102,7 +103,7 @@ impl TypeRelation<'tcx> for Glb<'_, 'combine, 'infcx, 'tcx> {
 }
 
 impl<'combine, 'infcx, 'tcx> LatticeDir<'infcx, 'tcx> for Glb<'_, 'combine, 'infcx, 'tcx> {
-    fn infcx(&self) -> &InferCtxt<'infcx, 'tcx> {
+    fn infcx(&mut self) -> &mut InferCtxt<'infcx, 'tcx> {
         self.fields.infcx
     }
 

compiler/rustc_infer/src/infer/higher_ranked/mod.rs

@@ -123,7 +123,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
 
     /// See `infer::region_constraints::RegionConstraintCollector::leak_check`.
     pub fn leak_check(
-        &self,
+        &mut self,
         overly_polymorphic: bool,
         snapshot: &CombinedSnapshot<'_, 'tcx>,
     ) -> RelateResult<'tcx, ()> {
@@ -137,10 +137,11 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
             return Ok(());
         }
 
+        let universe = self.universe();
         self.inner.unwrap_region_constraints().leak_check(
             self.tcx,
             overly_polymorphic,
-            self.universe(),
+            universe,
             snapshot,
         )
     }

compiler/rustc_infer/src/infer/lattice.rs

@@ -28,7 +28,7 @@ use rustc_middle::ty::TyVar;
 use rustc_middle::ty::{self, Ty};
 
 pub trait LatticeDir<'f, 'tcx>: TypeRelation<'tcx> {
-    fn infcx(&self) -> &InferCtxt<'f, 'tcx>;
+    fn infcx(&mut self) -> &mut InferCtxt<'f, 'tcx>;
 
     fn cause(&self) -> &ObligationCause<'tcx>;
 

compiler/rustc_infer/src/infer/lub.rs

@@ -108,7 +108,7 @@ impl<'tcx> ConstEquateRelation<'tcx> for Lub<'_, '_, '_, 'tcx> {
 }
 
 impl<'combine, 'infcx, 'tcx> LatticeDir<'infcx, 'tcx> for Lub<'_, 'combine, 'infcx, 'tcx> {
-    fn infcx(&self) -> &InferCtxt<'infcx, 'tcx> {
+    fn infcx(&mut self) -> &mut InferCtxt<'infcx, 'tcx> {
         self.fields.infcx
     }