Skip to content

Commit 0f97e02

Browse files
committed
Auto merge of rust-lang#99047 - matthiaskrgr:rollup-01vn70s, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - rust-lang#95635 (sess: stabilize `--terminal-width` as `--diagnostic-width`) - rust-lang#98718 (Stabilize `into_future`) - rust-lang#98795 (A few cleanups) - rust-lang#98798 (Fix caching bug in `download-rustc = true`) - rust-lang#99019 (Add doc comments in `rustc_middle::mir`) - rust-lang#99026 (Add test for and fix rust-lang/rust-clippy#9131) Failed merges: - rust-lang#98957 ( don't allow ZST in ScalarInt ) r? `@ghost` `@rustbot` modify labels: rollup
2 parents eba361a + 445702d commit 0f97e02

Some content is hidden

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

52 files changed

+707
-665
lines changed

compiler/rustc_borrowck/src/region_infer/mod.rs

+7-11
Original file line numberDiff line numberDiff line change
@@ -495,8 +495,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
495495
}
496496
}
497497

498-
NllRegionVariableOrigin::RootEmptyRegion
499-
| NllRegionVariableOrigin::Existential { .. } => {
498+
NllRegionVariableOrigin::Existential { .. } => {
500499
// For existential, regions, nothing to do.
501500
}
502501
}
@@ -1410,8 +1409,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
14101409
self.check_bound_universal_region(fr, placeholder, errors_buffer);
14111410
}
14121411

1413-
NllRegionVariableOrigin::RootEmptyRegion
1414-
| NllRegionVariableOrigin::Existential { .. } => {
1412+
NllRegionVariableOrigin::Existential { .. } => {
14151413
// nothing to check here
14161414
}
14171415
}
@@ -1513,8 +1511,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
15131511
self.check_bound_universal_region(fr, placeholder, errors_buffer);
15141512
}
15151513

1516-
NllRegionVariableOrigin::RootEmptyRegion
1517-
| NllRegionVariableOrigin::Existential { .. } => {
1514+
NllRegionVariableOrigin::Existential { .. } => {
15181515
// nothing to check here
15191516
}
15201517
}
@@ -1788,9 +1785,9 @@ impl<'tcx> RegionInferenceContext<'tcx> {
17881785
universe1.cannot_name(placeholder.universe)
17891786
}
17901787

1791-
NllRegionVariableOrigin::RootEmptyRegion
1792-
| NllRegionVariableOrigin::FreeRegion
1793-
| NllRegionVariableOrigin::Existential { .. } => false,
1788+
NllRegionVariableOrigin::FreeRegion | NllRegionVariableOrigin::Existential { .. } => {
1789+
false
1790+
}
17941791
}
17951792
}
17961793

@@ -2152,8 +2149,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
21522149
let blame_source = match from_region_origin {
21532150
NllRegionVariableOrigin::FreeRegion
21542151
| NllRegionVariableOrigin::Existential { from_forall: false } => true,
2155-
NllRegionVariableOrigin::RootEmptyRegion
2156-
| NllRegionVariableOrigin::Placeholder(_)
2152+
NllRegionVariableOrigin::Placeholder(_)
21572153
| NllRegionVariableOrigin::Existential { from_forall: true } => false,
21582154
};
21592155

0 commit comments

Comments
 (0)