From 909d0e83d626151f54461e3819d31166b796b805 Mon Sep 17 00:00:00 2001 From: Jack Huey Date: Sat, 15 May 2021 12:26:50 -0400 Subject: [PATCH] Missed a couple things --- .../rustc_infer/src/infer/canonical/canonicalizer.rs | 9 --------- compiler/rustc_infer/src/infer/region_constraints/mod.rs | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/compiler/rustc_infer/src/infer/canonical/canonicalizer.rs b/compiler/rustc_infer/src/infer/canonical/canonicalizer.rs index 337b8365d8c..c68705da413 100644 --- a/compiler/rustc_infer/src/infer/canonical/canonicalizer.rs +++ b/compiler/rustc_infer/src/infer/canonical/canonicalizer.rs @@ -304,15 +304,6 @@ impl<'cx, 'tcx> TypeFolder<'tcx> for Canonicalizer<'cx, 'tcx> { } fn fold_region(&mut self, r: ty::Region<'tcx>) -> ty::Region<'tcx> { - let tcx = self.tcx(); - let r = self - .infcx - .unwrap() - .inner - .borrow_mut() - .unwrap_region_constraints() - .opportunistic_resolve_region(tcx, r); - match *r { ty::ReLateBound(index, ..) => { if index >= self.binder_index { diff --git a/compiler/rustc_infer/src/infer/region_constraints/mod.rs b/compiler/rustc_infer/src/infer/region_constraints/mod.rs index d46a91b6a77..69a33d46052 100644 --- a/compiler/rustc_infer/src/infer/region_constraints/mod.rs +++ b/compiler/rustc_infer/src/infer/region_constraints/mod.rs @@ -47,7 +47,7 @@ pub struct RegionConstraintStorage<'tcx> { /// When we add a R1 == R2 constriant, we currently add (a) edges /// R1 <= R2 and R2 <= R1 and (b) we unify the two regions in this - /// table. You can then call `opportunistic_resolve_region` early + /// table. You can then call `opportunistic_resolve_var` early /// which will map R1 and R2 to some common region (i.e., either /// R1 or R2). This is important when fulfillment, dropck and other such /// code is iterating to a fixed point, because otherwise we sometimes