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

avoid reentrant lock acquire when ThreadIds run out #87011

Merged
merged 2 commits into from
Jul 10, 2021

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Jul 9, 2021

Discovered by @bjorn3

@rust-highfive
Copy link
Collaborator

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
library/std/src/thread/mod.rs Outdated Show resolved Hide resolved
@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
Contributor

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