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

Fix a pthread_t handle leak #114610 #114696

Merged
merged 2 commits into from Aug 23, 2023
Merged

Conversation

g0djan
Copy link
Contributor

@g0djan g0djan commented Aug 10, 2023

@rustbot
Copy link
Collaborator

rustbot commented Aug 10, 2023

r? @Mark-Simulacrum

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Aug 10, 2023
@@ -178,6 +179,17 @@ impl Thread {
}
}

cfg_if::cfg_if! {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason not to put this alongside the definition of Thread, i.e., in that same cfg_if?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved it to the same cfg_if

@g0djan
Copy link
Contributor Author

g0djan commented Aug 22, 2023

@Mark-Simulacrum is there anything else to address?

@Mark-Simulacrum
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Aug 23, 2023

📌 Commit 9b00e5f has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@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 Aug 23, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 23, 2023
…llaumeGomez

Rollup of 6 pull requests

Successful merges:

 - rust-lang#114696 (Fix a pthread_t handle leak rust-lang#114610)
 - rust-lang#115102 (Improve note for the `invalid_reference_casting` lint)
 - rust-lang#115103 (Disable bootstrap rustc version check)
 - rust-lang#115106 (ArchiveWrapper: handle LLVM API update)
 - rust-lang#115109 (Skip ExpandYamlAnchors when the config is missing)
 - rust-lang#115135 (Rustdoc: Add unstable --no-html-source flag)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 128ff08 into rust-lang:master Aug 23, 2023
11 checks passed
@rustbot rustbot added this to the 1.74.0 milestone Aug 23, 2023
@wesleywiser wesleywiser added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Sep 12, 2023
@wesleywiser
Copy link
Member

Nominating for beta backport so that this fix can ride the release train with the wasm32-wasi-preview1-threads target which is newly Tier 2 in 1.73.

@cuviper
Copy link
Member

cuviper commented Sep 21, 2023

Beta-backport approved today on zulip.

@rustbot label +beta-accepted

@rustbot rustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Sep 21, 2023
@cuviper cuviper mentioned this pull request Sep 22, 2023
@cuviper cuviper modified the milestones: 1.74.0, 1.73.0 Sep 22, 2023
@cuviper cuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Sep 22, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 22, 2023
[beta] backports

-  Fix a pthread_t handle leak rust-lang#114696
-  MCP661: Move wasm32-wasi-preview1-threads target to Tier 2 rust-lang#115345
-  Don't modify libstd to dump rustc ICEs rust-lang#115627
-  Paper over an accidental regression rust-lang#115844
-  Update to LLVM 17.0.0 rust-lang#115959

r? cuviper
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants