Skip to content

avoid reentrant lock acquire when ThreadIds run out - #87011

Merged
bors merged 2 commits into
rust-lang:masterfrom
RalfJung:thread-id-supply-shortage
Jul 10, 2021
Merged

avoid reentrant lock acquire when ThreadIds run out#87011
bors merged 2 commits into
rust-lang:masterfrom
RalfJung:thread-id-supply-shortage

Conversation

@RalfJung

Copy link
Copy Markdown
Member

Discovered by @bjorn3

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @dtolnay

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

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 9, 2021
@RalfJung
RalfJungforce-pushed the thread-id-supply-shortage branch from 3af7b44 to e33c211CompareJuly 9, 2021 18:53
Comment threadlibrary/std/src/thread/mod.rs Outdated
Comment threadlibrary/std/src/thread/mod.rs Outdated
@RalfJung
RalfJungforce-pushed the thread-id-supply-shortage branch from e33c211 to c0dc01bCompareJuly 10, 2021 09:53
@RalfJung
RalfJungforce-pushed the thread-id-supply-shortage branch from c0dc01b to 2750d3aCompareJuly 10, 2021 09:54
Comment threadlibrary/std/src/thread/mod.rs Outdated
@RalfJungRalfJung changed the title we can't panic when ThreadIds run outavoid reentrant lock acquire when ThreadIds run outJul 10, 2021
@nagisa

Copy link
Copy Markdown
Member

r? @nagisa
@bors r+

@bors

bors commented Jul 10, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit dbc2b55 has been approved by nagisa

@rust-highfiverust-highfive assigned nagisa and unassigned dtolnayJul 10, 2021
@borsbors 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
@JohnTitorJohnTitor mentioned this pull request 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:masterJul 10, 2021
@rustbotrustbot 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 freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: 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

@RalfJung@rust-highfive@nagisa@bors@est31@bjorn3@dtolnay@rustbot