Rollup of 6 pull requests #91093
Merged
Rollup of 6 pull requests #91093
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
While it's an internal function, it is easy to create invalid Arc/Rcs to a dangling pointer with it. Fixes rust-lang#89740
Helps avoid rightward drift.
Because the parser directory has already reached the 1000 file limit.
Co-authored-by: Esteban Kuber <estebank@users.noreply.github.com>
…value" This reverts commit 0a2b7d7, reversing changes made to 47c1bd1. This caused several unforeseen problems: - rust-lang#91029 - rust-lang#89764 (comment)
…=Mark-Simulacrum Mark `Arc::from_inner` / `Rc::from_inner` as unsafe While it's an internal function, it is easy to create invalid Arc/Rcs to a dangling pointer with it. Fixes rust-lang#89740
…h726 Fix float ICE This fixes rust-lang#90728
Fix ICE `rust-lang#90993`: add missing call to cancel Fix rust-lang#90993
Adopt let_else in more places in rustc_mir_build Helps avoid rightward drift. followup of rust-lang#89933
…ebank Suggest `await` in more situations where infer types are involved Currently we use `TyS::same_type` in diagnostics that suggest adding `.await` to opaque future types. This change makes the suggestion slightly more general, when we're comparing types like `Result<T, E>` and `Result<_, _>` which happens sometimes in places like `match` patterns or `let` statements with partially-elaborated types. ---- Question: 1. Is this change worthwhile? Totally fine if it doesn't make sense adding. 2. Should `same_type_modulo_infer` live in `rustc_infer::infer::error_reporting` or alongside the other method in `rustc_middle::ty::util`? 3. Should we generalize this change? I wanted to change all usages, but I don't want erroneous suggestions when adding `.field_name`...
Revert "require full validity when determining the discriminant of a value" This reverts commit 0a2b7d7, reversing changes made to 47c1bd1. This caused several unforeseen problems: - rust-lang#91029 - rust-lang#89764 (comment) So I think it's best to revert for now while we keep discussing the MIR semantics of getting a discriminant. r? `@oli-obk`
|
@bors r+ rollup=never p=6 |
|
📌 Commit 83c83d4 has been approved by |
bors
added
the
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
rust-highfive
added a commit
to rust-lang-nursery/rust-toolstate
that referenced
this pull request
Nov 21, 2021
Tested on commit rust-lang/rust@5bc9807. Direct link to PR: <rust-lang/rust#91093> 🎉 miri on windows: test-fail → test-pass (cc @RalfJung @eddyb @oli-obk). 🎉 miri on linux: test-fail → test-pass (cc @RalfJung @eddyb @oli-obk).
This was referenced Nov 21, 2021
|
Finished benchmarking commit (5bc9807): comparison url. Summary: This benchmark run did not return any relevant changes. If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf. @rustbot label: -perf-regression |
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.
Successful merges:
Arc::from_inner/Rc::from_inneras unsafe #89741 (MarkArc::from_inner/Rc::from_inneras unsafe)#90993: add missing call to cancel #90994 (Fix ICE#90993: add missing call to cancel)awaitin more situations where infer types are involved #91022 (Suggestawaitin more situations where infer types are involved)Failed merges:
r? @ghost
@rustbot modify labels: rollup
Create a similar rollup