Skip to content

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Jul 9, 2021

Discovered by @bjorn3

@rust-highfive
Copy link
Contributor

r? @dtolnay

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 9, 2021
@RalfJung RalfJung force-pushed the thread-id-supply-shortage branch from 3af7b44 to e33c211 Compare July 9, 2021 18:53
@RalfJung RalfJung force-pushed the thread-id-supply-shortage branch from e33c211 to c0dc01b Compare July 10, 2021 09:53
@RalfJung RalfJung force-pushed the thread-id-supply-shortage branch from c0dc01b to 2750d3a Compare July 10, 2021 09:54
@RalfJung RalfJung changed the title we can't panic when ThreadIds run out avoid reentrant lock acquire when ThreadIds run out Jul 10, 2021
@nagisa
Copy link
Member

nagisa commented Jul 10, 2021

r? @nagisa
@bors r+

@bors
Copy link
Collaborator

bors commented Jul 10, 2021

📌 Commit dbc2b55 has been approved by nagisa

@rust-highfive rust-highfive assigned nagisa and unassigned dtolnay Jul 10, 2021
@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 10, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 10, 2021
Rollup of 5 pull requests

Successful merges:

 - rust-lang#87006 (Revert the revert of renaming traits::VTable to ImplSource)
 - rust-lang#87011 (avoid reentrant lock acquire when ThreadIds run out)
 - rust-lang#87013 (Fix several ICEs related to malformed `#[repr(...)]` attributes)
 - rust-lang#87020 (remove const_raw_ptr_to_usize_cast feature)
 - rust-lang#87028 (Fix type: `'satic` -> `'static`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 0ca5fc2 into rust-lang:master Jul 10, 2021
@rustbot rustbot added this to the 1.55.0 milestone Jul 10, 2021
@RalfJung RalfJung deleted the thread-id-supply-shortage branch July 11, 2021 12:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

8 participants