Use try_normalize_erasing_regions in needs_drop #91462
Closed
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
rust-highfive
added
the
S-waiting-on-review
jackh726
requested changes
Dec 2, 2021
|
r=me after changing to @bors delegate+ |
|
✌️ @b-naber can now approve this pull request |
Aaron1011
reviewed
Dec 2, 2021
compiler/rustc_middle/src/ty/util.rs
Outdated
| let erased = tcx.normalize_erasing_regions(param_env, query_ty); | ||
| tcx.needs_drop_raw(param_env.and(erased)) | ||
| // If normalization fails, we just use `query_ty`. | ||
| let query_ty = match tcx.try_normalize_erasing_regions(param_env, query_ty) { |
There was a problem hiding this comment.
You could use .unwrap_or(query_ty) here
jackh726
added
S-waiting-on-author
b-naber
force-pushed
the
use-try-normalize-erasing-regions
branch
from
fe81b10 to
34dc687
Compare
b-naber
force-pushed
the
use-try-normalize-erasing-regions
branch
from
34dc687 to
a11994e
Compare
|
@bors r=jackh726 rollup |
|
📌 Commit a11994e has been approved by |
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Dec 3, 2021
…egions, r=jackh726 Use try_normalize_erasing_regions in needs_drop Fixes rust-lang#81199 r? `@jackh726`
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Dec 3, 2021
…egions, r=jackh726 Use try_normalize_erasing_regions in needs_drop Fixes rust-lang#81199 r? ``@jackh726``
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Dec 3, 2021
…askrgr Rollup of 10 pull requests Successful merges: - rust-lang#88906 (Implement write() method for Box<MaybeUninit<T>>) - rust-lang#90269 (Make `Option::expect` unstably const) - rust-lang#90854 (Type can be unsized and uninhabited) - rust-lang#91170 (rustdoc: preload fonts) - rust-lang#91273 (Fix ICE rust-lang#91268 by checking that the snippet ends with a `)`) - rust-lang#91381 (Android: -ldl must appear after -lgcc when linking) - rust-lang#91453 (Document Windows TLS drop behaviour) - rust-lang#91462 (Use try_normalize_erasing_regions in needs_drop) - rust-lang#91474 (suppress warning about set_errno being unused on DragonFly) - rust-lang#91483 (Sync rustfmt subtree) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
|
☔ The latest upstream changes (presumably #91486) made this pull request unmergeable. Please resolve the merge conflicts. |
bors
added
S-waiting-on-author
|
This has been merged into master by bors (in #91486), but GitHub didn't detect it for whatever reason. Closing. |
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.
Fixes #81199
r? @jackh726