Skip to content

Commit d452c3e

Browse files
committed
fix
1 parent abb5a63 commit d452c3e

File tree

1 file changed

+3
-18
lines changed

1 file changed

+3
-18
lines changed

src/librustc/ty/flags.rs

+3-18
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ pub(crate) fn sty_in_local_arena(st: &ty::TypeVariants) -> bool {
317317
ty::ExistentialPredicate::AutoTrait(_) => {}
318318
}
319319
}
320-
region_in_local_arena(r)
320+
r.keep_in_local_tcx()
321321
}
322322

323323
ty::TyArray(tt, len) => {
@@ -334,7 +334,7 @@ pub(crate) fn sty_in_local_arena(st: &ty::TypeVariants) -> bool {
334334
}
335335

336336
ty::TyRef(r, ref m) => {
337-
region_in_local_arena(r) ||
337+
r.keep_in_local_tcx() ||
338338
ty_in_local_arena(m.ty)
339339
}
340340

@@ -367,21 +367,6 @@ fn tys_in_local_arena(tys: &[Ty]) -> bool {
367367
false
368368
}
369369

370-
fn region_in_local_arena(r: ty::Region) -> bool {
371-
match *r {
372-
ty::ReVar(..) | ty::ReSkolemized(..) => true,
373-
ty::ReLateBound(..) |
374-
ty::ReEarlyBound(..) |
375-
ty::ReEmpty |
376-
ty::ReStatic |
377-
ty::ReFree { .. } |
378-
ty::ReScope { .. } |
379-
ty::ReErased |
380-
ty::ReCanonical(..) |
381-
ty::ReClosureBound(..) => false
382-
}
383-
}
384-
385370
#[inline(always)]
386371
fn const_in_local_arena(constant: &ty::Const) -> bool {
387372
if ty_in_local_arena(constant.ty) {
@@ -401,7 +386,7 @@ fn substs_in_local_arena(substs: &Substs) -> bool {
401386
}
402387

403388
for r in substs.regions() {
404-
if region_in_local_arena(r) {
389+
if r.keep_in_local_tcx() {
405390
return true;
406391
}
407392
}

0 commit comments

Comments
 (0)