Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 5 pull requests #87029

Merged
merged 13 commits into from
Jul 10, 2021
Merged

Rollup of 5 pull requests #87029

merged 13 commits into from
Jul 10, 2021

Conversation

JohnTitor
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

ptrojahn and others added 13 commits July 9, 2021 18:26
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`
@rustbot rustbot added the rollup A PR which is a rollup label Jul 10, 2021
@JohnTitor
Copy link
Member Author

@bors r+ p=5 rollup=never

@bors
Copy link
Contributor

bors commented Jul 10, 2021

📌 Commit 36b142f has been approved by JohnTitor

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 10, 2021
@bors
Copy link
Contributor

bors commented Jul 10, 2021

⌛ Testing commit 36b142f with merge a31431f...

@bors
Copy link
Contributor

bors commented Jul 10, 2021

☀️ Test successful - checks-actions
Approved by: JohnTitor
Pushing a31431f to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 10, 2021
@bors bors merged commit a31431f into rust-lang:master Jul 10, 2021
@rustbot rustbot added this to the 1.55.0 milestone Jul 10, 2021
@JohnTitor JohnTitor deleted the rollup-0yapv7z branch July 10, 2021 19:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants