A few cleanups #98795
Merged
A few cleanups #98795
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
the
T-compiler
|
r? @fee1-dead (rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
jackh726
commented
Jul 2, 2022
Merged
jackh726
force-pushed
the
lexical_region_resolve_cleanup
branch
2 times, most recently
from
7a16833
to
4589d93
Compare
fee1-dead
reviewed
Jul 2, 2022
| @@ -503,7 +503,7 @@ impl<'cx, 'tcx> UniversalRegionsBuilder<'cx, 'tcx> { | |||
|
|
|||
| let root_empty = self | |||
| .infcx | |||
| .next_nll_region_var(NllRegionVariableOrigin::RootEmptyRegion) | |||
| .next_nll_region_var(NllRegionVariableOrigin::Existential { from_forall: true }) | |||
There was a problem hiding this comment.
I am not familiar with nll code and I can't say for sure if they would result in the same logic.
There was a problem hiding this comment.
I went through all the uses of RootEmptyRegion and the were in the same branch as Existential { from_forall: true }
|
r? compiler |
jackh726
force-pushed
the
lexical_region_resolve_cleanup
branch
from
4589d93
to
2aa8ee8
Compare
|
☔ The latest upstream changes (presumably #98584) made this pull request unmergeable. Please resolve the merge conflicts. |
compiler-errors
approved these changes
Jul 7, 2022
|
@bors r+ |
|
📌 Commit 2aa8ee81ff75c4581b09cb64340b9378ae999e6c has been approved by It is now in the queue for this repository. |
bors
added
S-waiting-on-bors
|
@bors r- Need to rebase |
bors
added
S-waiting-on-author
|
whoops, didn't see bors's comment. |
…esolve_region, and remove RootEmptyRegion
jackh726
force-pushed
the
lexical_region_resolve_cleanup
branch
from
2aa8ee8
to
31e1a77
Compare
|
@bors r=compiler-errors |
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jul 8, 2022
…anup, r=compiler-errors A few cleanups Each commit is (mostly) self-explanatory. These changes have come as I try to remove `ReEmpty` (rust-lang#98559).
Dylan-DPC
added a commit
to Dylan-DPC/rust
that referenced
this pull request
Jul 8, 2022
…anup, r=compiler-errors A few cleanups Each commit is (mostly) self-explanatory. These changes have come as I try to remove `ReEmpty` (rust-lang#98559).
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jul 8, 2022
…askrgr 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
JohnTitor
added a commit
to JohnTitor/rust-semverver
that referenced
this pull request
Jul 16, 2022
Signed-off-by: Yuki Okushi <jtitor@2k36.org>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Each commit is (mostly) self-explanatory. These changes have come as I try to remove
ReEmpty(#98559).