Rollup of 5 pull requests #87029
Merged
Rollup of 5 pull requests #87029
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
As rust-lang#72114 and rust-lang#73055 were merged so closely together I think this accidentally happened while rebasing
…-schievink Revert the revert of renaming traits::VTable to ImplSource As rust-lang#72114 and rust-lang#73055 were merged so closely together I think this accidentally happened while rebasing
… r=nagisa avoid reentrant lock acquire when ThreadIds run out Discovered by `@bjorn3`
Fix several ICEs related to malformed `#[repr(...)]` attributes This PR fixes rust-lang#83921. rust-lang#83921 actually contains two related but distinct issues (one of them incorrectly reported as a duplicate in rust-lang#83921 (comment)): In the first, a call to `delay_span_bug` leads to an ICE when compiling with `-Zunpretty=everybody_loops` (and some other pretty-printing modes), because the corresponding error is emitted in a later pass, which does not run when only pretty-printing is requested. The second issue is about parsing `#[repr(...)]` attributes. Currently, all of the following cause an ICE when applied to a struct/enum: ```rust #[repr(packed())] #[repr(align)] #[repr(align(2, 4))] #[repr(align())] #[repr(i8())] #[repr(u32(42))] #[repr(i64 = 2)] ``` I have fixed this by expanding the well-formedness checks in `find_repr_attrs()`.
…t, r=oli-obk remove const_raw_ptr_to_usize_cast feature This feature currently has the strange status of "const-only `unsafe`", which was an experiment that we no longer think is a good idea. We need to find better ways to enable things like "messing with the low bits of a pointer" during CTFE. r? `@oli-obk`
Fix type: `'satic` -> `'static` Pointed out on discord: https://discord.com/channels/273534239310479360/490356824420122645/863434443170250793 ~~The fact that this compiles is probably a bug.~~ Nope it's `#![feature(in_band_lifetimes)]` (Thanks to [floppy](https://discord.com/channels/273534239310479360/490356824420122645/863437381671059486) ~~[The docs](https://doc.rust-lang.org/stable/nightly-rustc/rustc_mir/transform/inline/struct.Inliner.html#method.check_codegen_attributes) seem to indicate rust thinks this function is generic over the lifetime `'satic`~~ This is because of `in_band_lifetimes`
|
@bors r+ p=5 rollup=never |
|
📌 Commit 36b142f has been approved by |
bors
added
the
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
This was referenced Jul 10, 2021
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:
#[repr(...)]attributes #87013 (Fix several ICEs related to malformed#[repr(...)]attributes)'satic->'static#87028 (Fix type:'satic->'static)Failed merges:
r? @ghost
@rustbot modify labels: rollup
Create a similar rollup