Skip to content

Commit 52b605c

Browse files
committedMay 24, 2020
Auto merge of #72362 - matthewjasper:remove-rescope, r=nikomatsakis
Remove ReScope `ReScope` is unnecessary now that AST borrowck is gone and we're erasing the results of region inference in function bodies. This removes about as much of the old regionck code as possible without having to enable NLL fully. cc #68261 r? @nikomatsakis
2 parents 3137f8e + 9754b3f commit 52b605c

File tree

81 files changed

+614
-2759
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+614
-2759
lines changed
 

‎src/librustc_infer/infer/canonical/canonicalizer.rs

-1
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,6 @@ impl<'cx, 'tcx> TypeFolder<'tcx> for Canonicalizer<'cx, 'tcx> {
332332
ty::ReStatic
333333
| ty::ReEarlyBound(..)
334334
| ty::ReFree(_)
335-
| ty::ReScope(_)
336335
| ty::ReEmpty(_)
337336
| ty::RePlaceholder(..)
338337
| ty::ReErased => self.canonicalize_region_mode.canonicalize_free_region(self, r),

‎src/librustc_infer/infer/combine.rs

-1
Original file line numberDiff line numberDiff line change
@@ -619,7 +619,6 @@ impl TypeRelation<'tcx> for Generalizer<'_, 'tcx> {
619619
| ty::ReVar(..)
620620
| ty::ReEmpty(_)
621621
| ty::ReStatic
622-
| ty::ReScope(..)
623622
| ty::ReEarlyBound(..)
624623
| ty::ReFree(..) => {
625624
// see common code below

0 commit comments

Comments
 (0)