Skip to content

Commit 909d0e8

Browse files
committed
Missed a couple things
1 parent d255477 commit 909d0e8

File tree

2 files changed

+1
-10
lines changed

2 files changed

+1
-10
lines changed

compiler/rustc_infer/src/infer/canonical/canonicalizer.rs

-9
Original file line numberDiff line numberDiff line change
@@ -304,15 +304,6 @@ impl<'cx, 'tcx> TypeFolder<'tcx> for Canonicalizer<'cx, 'tcx> {
304304
}
305305

306306
fn fold_region(&mut self, r: ty::Region<'tcx>) -> ty::Region<'tcx> {
307-
let tcx = self.tcx();
308-
let r = self
309-
.infcx
310-
.unwrap()
311-
.inner
312-
.borrow_mut()
313-
.unwrap_region_constraints()
314-
.opportunistic_resolve_region(tcx, r);
315-
316307
match *r {
317308
ty::ReLateBound(index, ..) => {
318309
if index >= self.binder_index {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ pub struct RegionConstraintStorage<'tcx> {
4747

4848
/// When we add a R1 == R2 constriant, we currently add (a) edges
4949
/// R1 <= R2 and R2 <= R1 and (b) we unify the two regions in this
50-
/// table. You can then call `opportunistic_resolve_region` early
50+
/// table. You can then call `opportunistic_resolve_var` early
5151
/// which will map R1 and R2 to some common region (i.e., either
5252
/// R1 or R2). This is important when fulfillment, dropck and other such
5353
/// code is iterating to a fixed point, because otherwise we sometimes

0 commit comments

Comments
 (0)