Skip to content

Cleanup timeouts in pthread condvar #103146

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Dec 11, 2022
Merged

Cleanup timeouts in pthread condvar #103146

merged 1 commit into from
Dec 11, 2022

Conversation

joboet
Copy link
Member

@joboet joboet commented Oct 17, 2022

No description provided.

@rustbot rustbot added the T-libs Relevant to the library team, which will review and decide on the PR/issue. label Oct 17, 2022
@rust-highfive
Copy link
Contributor

r? @Mark-Simulacrum

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

@rustbot
Copy link
Collaborator

rustbot commented Oct 17, 2022

Hey! It looks like you've submitted a new PR for the library teams!

If this PR contains changes to any rust-lang/rust public library APIs then please comment with @rustbot label +T-libs-api -T-libs to tag it appropriately. If this PR contains changes to any unstable APIs please edit the PR description to add a link to the relevant API Change Proposal or create one if you haven't already. If you're unsure where your change falls no worries, just leave it as is and the reviewer will take a look and make a decision to forward on if necessary.

Examples of T-libs-api changes:

  • Stabilizing library features
  • Introducing insta-stable changes such as new implementations of existing stable traits on existing stable types
  • Introducing new or changing existing unstable library APIs (excluding permanently unstable features / features without a tracking issue)
  • Changing public documentation in ways that create new stability guarantees
  • Changing observable runtime behavior of library APIs

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 17, 2022
@joboet joboet force-pushed the cleanup_pthread_condvar branch from 2045b16 to 84490b3 Compare October 17, 2022 12:05
@Mark-Simulacrum Mark-Simulacrum added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 29, 2022
@joboet
Copy link
Member Author

joboet commented Nov 2, 2022

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 2, 2022
@Mark-Simulacrum
Copy link
Member

@rustbot author

@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 6, 2022
@bors
Copy link
Collaborator

bors commented Nov 12, 2022

☔ The latest upstream changes (presumably #103150) made this pull request unmergeable. Please resolve the merge conflicts.

@joboet joboet force-pushed the cleanup_pthread_condvar branch from 84490b3 to da0a542 Compare December 2, 2022 13:38
@joboet
Copy link
Member Author

joboet commented Dec 2, 2022

@rustbot ready
@Mark-Simulacrum I've now kept all assertions and the behaviour of timeouts the same, so this PR now only contains the cleanup.

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 2, 2022
@Mark-Simulacrum
Copy link
Member

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Dec 10, 2022

📌 Commit da0a542 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 Dec 10, 2022
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Dec 10, 2022
@matthiaskrgr
Rollup merge of rust-lang#103146 - joboet:cleanup_pthread_condvar, r=…
59af020 
…Mark-Simulacrum

Cleanup timeouts in pthread condvar
@matthiaskrgr matthiaskrgr mentioned this pull request Dec 10, 2022
Closed
@matthiaskrgr matthiaskrgr mentioned this pull request Dec 10, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 11, 2022
@bors
Auto merge of rust-lang#105543 - matthiaskrgr:rollup-s9zj0pq, r=matth…
e1c9121 
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#103146 (Cleanup timeouts in pthread condvar)
 - rust-lang#105459 (Build rust-analyzer proc-macro server by default)
 - rust-lang#105460 (Bump compiler-builtins to 0.1.85)
 - rust-lang#105511 (Update rustix to 0.36.5)
 - rust-lang#105530 (Clean up lifetimes in rustdoc syntax highlighting)
 - rust-lang#105534 (Add Nilstrieb to compiler reviewers)
 - rust-lang#105542 (Some method confirmation code nits)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 7f4e7c1 into rust-lang:master Dec 11, 2022
@rustbot rustbot added this to the 1.68.0 milestone Dec 11, 2022
@joboet joboet deleted the cleanup_pthread_condvar branch July 6, 2023 13:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mark-Simulacrum Mark-Simulacrum Mark-Simulacrum left review comments

Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
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
Milestone
1.68.0
Development

Successfully merging this pull request may close these issues.
5 participants
@joboet @rust-highfive @rustbot @Mark-Simulacrum @bors