Rollup of 7 pull requests #92694
Closed
Rollup of 7 pull requests #92694
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
It's already a (fat) reference. Double referencing it creates lifetime issues for its methods that want to return iterators.
Add `std::error::Report` type This is a continuation of rust-lang#90174, split into a separate PR since I cannot push to ``@seanchen1991`` 's fork
…pointee, r=jackh726 Normalize struct tail type when checking Pointee trait Let's go ahead and implement the FIXMEs by properly normalizing the struct-tail type when satisfying a Pointee obligation. This should fix the ICE when we try to calculate a layout depending on `<Ty as Pointee>::Metadata` later. Fixes rust-lang#92128 Fixes rust-lang#92577 Additionally, mark the obligation as ambiguous if there are any infer types in that struct-tail type. This has the effect of causing `<_ as Pointee>::Metadata` to be properly replaced with an infer variable ([here](https://github.com/rust-lang/rust/blob/master/compiler/rustc_trait_selection/src/traits/project.rs#L813)) and registered as an obligation... this turns out to be very important in unifying function parameters with formals that are assoc types. Fixes rust-lang#91446
rustc_metadata: Stop passing `CrateMetadataRef` by reference (step 1) It's already a (fat) reference. Double referencing it creates lifetime issues for its methods that want to return iterators. --- Extracted from rust-lang#92245 for a perf run. The PR changes a lot of symbol names due to function signature changes, so it's hard to do differential profiling, let's spend some machine time instead.
mangling_v0: Skip extern blocks during mangling There's no need to include the dummy `Nt` into the symbol name, items in extern blocks belong to their parent modules for all purposes except for inheriting the ABI and attributes. Follow up to rust-lang#92032 (There's also a drive-by fix to the `rust-demangler` tool's tests, which don't run on CI, I initially attempted using them for testing this PR.)
…uillaumeGomez rustdoc: Preserve rendering of macro_rules matchers when possible Fixes rust-lang#92331. This approach restores the behavior prior to rust-lang#86282 **if** the matcher token held by the compiler **and** the matcher token found in the source code are identical TokenTrees. Thus rust-lang#86208 remains fixed, but without regressing formatting for the vast majority of macros which are not macro-generated.
Allow unwinding from OOM hooks This is split off from rust-lang#88098 and contains just the bare minimum to allow specifying a custom OOM hook with `set_alloc_error_hook` which unwinds instead of aborting. See rust-lang#88098 for an actual command-line flag which switches the default OOM behavior to unwind instead of aborting. Previous perf results show a negligible impact on performance.
…-const-expr, r=oli-obk Normalize generator-local types with unevaluated constants Normalize generator-interior types in addition to (i.e. instead of just) erasing regions, since sometimes we collect types with unevaluated const exprs. Fixes rust-lang#84737 Fixes rust-lang#88171 Fixes rust-lang#92091 Fixes rust-lang#92634 Probably also fixes rust-lang#73114, but that one has no code I could test. It looks like it's the same issue, though.
rustbot
added
the
T-compiler
|
@bors r+ rollup=never p=7 |
|
📌 Commit a8edbfe has been approved by |
bors
added
the
S-waiting-on-bors
|
⌛ Testing commit a8edbfe with merge 1f45ae8daf37cf23ab26c20e6ec593a73a7a40ce... |
|
💥 Test timed out |
bors
added
S-waiting-on-review
|
@bors retry dist-x86_64-apple-alt hung |
bors
added
S-waiting-on-bors
|
⌛ Testing commit a8edbfe with merge 6d205536864139fc696aea0b0d136e804e40fe26... |
|
💔 Test failed - checks-actions |
bors
added
S-waiting-on-review
|
@bors retry dist-x86_64-apple-alt |
bors
added
S-waiting-on-bors
|
⌛ Testing commit a8edbfe with merge 582797a7612886e7c38b6ceb4a555b997c68d6de... |
|
💥 Test timed out |
bors
added
S-waiting-on-review
|
Closing out a stale rollup. |
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:
std::error::Reporttype #91938 (Addstd::error::Reporttype)CrateMetadataRefby reference (step 1) #92277 (rustc_metadata: Stop passingCrateMetadataRefby reference (step 1))Failed merges:
r? @ghost
@rustbot modify labels: rollup
Create a similar rollup