Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rollup of 6 pull requests #99044

Closed
wants to merge 15 commits into from
Closed

Rollup of 6 pull requests #99044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
992cfc1
Stabilize `into_future`
yoshuawuyts Jun 30, 2022
e528884
sess: stabilize `--terminal-width`
davidtwco Feb 14, 2022
cd23af6
session: `terminal-width` -> `output-width`
davidtwco Jun 16, 2022
44c1fcc
session: `output-width` -> `diagnostic-width`
davidtwco Jul 6, 2022
9d2a9d9
Fix last `let_chains` blocker
c410-f3r Jul 7, 2022
933a994
Add doc comments in `rustc_middle::mir`
pierwill Jul 7, 2022
98b8419
Add test for and fix rust-lang/rust-clippy#9131
anall Jul 7, 2022
2471431
Move is_free and is_free_or_static to Region, change resolve_var to r…
jackh726 Jun 28, 2022
31e1a77
Move code from rustc_trait_selection/opaque_types to better places
jackh726 Jul 1, 2022
8082a5b
Rollup merge of #95635 - davidtwco:terminal-width-stabilization, r=ol…
Dylan-DPC Jul 8, 2022
1916f84
Rollup merge of #98633 - c410-f3r:yet-another-let-chain, r=estebank
Dylan-DPC Jul 8, 2022
1da9c94
Rollup merge of #98718 - yoshuawuyts:stabilize-into-future, r=yaahc
Dylan-DPC Jul 8, 2022
897062f
Rollup merge of #98795 - jackh726:lexical_region_resolve_cleanup, r=c…
Dylan-DPC Jul 8, 2022
fea7e45
Rollup merge of #99019 - pierwill:doc-mir-statement, r=cjgillot
Dylan-DPC Jul 8, 2022
e7c69bf
Rollup merge of #99026 - anall:buffix/clippy-9131, r=xFrednet
Dylan-DPC Jul 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 7 additions & 11 deletions compiler/rustc_borrowck/src/region_infer/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,8 +495,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
}
}

NllRegionVariableOrigin::RootEmptyRegion
| NllRegionVariableOrigin::Existential { .. } => {
NllRegionVariableOrigin::Existential { .. } => {
// For existential, regions, nothing to do.
}
}
Expand Down Expand Up @@ -1410,8 +1409,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
self.check_bound_universal_region(fr, placeholder, errors_buffer);
}

NllRegionVariableOrigin::RootEmptyRegion
| NllRegionVariableOrigin::Existential { .. } => {
NllRegionVariableOrigin::Existential { .. } => {
// nothing to check here
}
}
Expand Down Expand Up @@ -1513,8 +1511,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
self.check_bound_universal_region(fr, placeholder, errors_buffer);
}

NllRegionVariableOrigin::RootEmptyRegion
| NllRegionVariableOrigin::Existential { .. } => {
NllRegionVariableOrigin::Existential { .. } => {
// nothing to check here
}
}
Expand Down Expand Up @@ -1788,9 +1785,9 @@ impl<'tcx> RegionInferenceContext<'tcx> {
universe1.cannot_name(placeholder.universe)
}

NllRegionVariableOrigin::RootEmptyRegion
| NllRegionVariableOrigin::FreeRegion
| NllRegionVariableOrigin::Existential { .. } => false,
NllRegionVariableOrigin::FreeRegion | NllRegionVariableOrigin::Existential { .. } => {
false
}
}
}

Expand Down Expand Up @@ -2152,8 +2149,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
let blame_source = match from_region_origin {
NllRegionVariableOrigin::FreeRegion
| NllRegionVariableOrigin::Existential { from_forall: false } => true,
NllRegionVariableOrigin::RootEmptyRegion
| NllRegionVariableOrigin::Placeholder(_)
NllRegionVariableOrigin::Placeholder(_)
| NllRegionVariableOrigin::Existential { from_forall: true } => false,
};

Expand Down
Loading