Implementation: `#[feature(nonpoison_condvar)]` by connortsui20 · Pull Request #144651 · rust-lang/rust

connortsui20 · 2025-07-29T20:13:48Z

Tracking Issue: #134645

This PR continues the effort made in #144022 by adding the implementation of nonpoison::condvar.

Many of the changes here are similar to the changes made to implement nonpoison::mutex.

There are two other changes here. The first is that the Barrier implementation is migrated to use the nonpoison::Condvar instead of the poison variant. The second (which might be subject to some discussion) is that WaitTimeoutResult is moved up to mod.rs, as both condvar variants need that type (and I do not know if there is a better place to put it now).

Related PRs

nonpoison_rwlock implementation: Implementation: #[feature(nonpoison_rwlock)] #144648
nonpoison_once implementation: Implementation: #[feature(nonpoison_once)] #144653

rustbot · 2025-07-29T20:13:54Z

r? @thomcc

rustbot has assigned @thomcc.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

…ark-Simulacrum Implementation: `#[feature(nonpoison_rwlock)]` Tracking Issue: rust-lang#134645 This PR continues the effort made in rust-lang#144022 by adding the implementation of `nonpoison::rwlock`. Many of the changes here are similar to the changes made to implement `nonpoison::mutex`. The only real difference is that this PR includes a reorganizing of the existing `poison::rwlock` file that hopefully makes both variants more readable. ### Related PRs - `nonpoison_condvar` implementation: rust-lang#144651 - `nonpoison_once` implementation: rust-lang#144653

Rollup merge of #144648 - connortsui20:nonpoison_rwlock, r=Mark-Simulacrum Implementation: `#[feature(nonpoison_rwlock)]` Tracking Issue: #134645 This PR continues the effort made in #144022 by adding the implementation of `nonpoison::rwlock`. Many of the changes here are similar to the changes made to implement `nonpoison::mutex`. The only real difference is that this PR includes a reorganizing of the existing `poison::rwlock` file that hopefully makes both variants more readable. ### Related PRs - `nonpoison_condvar` implementation: #144651 - `nonpoison_once` implementation: #144653

bors · 2025-08-23T09:16:42Z

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

Adds the equivalent `nonpoison` types to the `poison::condvar` module. These types and implementations are gated under the `nonpoison_condvar` feature gate. Signed-off-by: Connor Tsui <connor.tsui20@gmail.com>

tgross35 · 2025-08-23T13:18:09Z

I believe Thom has been out

r? Libs

rustbot · 2025-08-23T13:18:12Z

Failed to set assignee to Libs: cannot assign: response: {"message":"Not Found","documentation_url":"https://docs.github.com/rest/issues/assignees#add-assignees-to-an-issue","status":"404"}

Note: Only org members with at least the repository "read" role, users with write permissions, or people who have commented on the PR may be assigned.

tgross35 · 2025-08-23T13:18:20Z

r? libs

Adds tests for the `nonpoison::Mutex` variant by using a macro to duplicate the existing `poison` tests. Note that all of the tests here are adapted from the existing `poison` tests. Also steals the `test_mutex_arc_condvar` test from `mutex.rs`. Signed-off-by: Connor Tsui <connor.tsui20@gmail.com>

Signed-off-by: Connor Tsui <connor.tsui20@gmail.com>

Since `WaitTimeoutResult` is poison-agnostic, we want to use the same type for both variants of `Condvar`. Signed-off-by: Connor Tsui <connor.tsui20@gmail.com>

rustbot · 2025-08-23T13:21:13Z

This PR was rebased onto a different master commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

Signed-off-by: Connor Tsui <connor.tsui20@gmail.com>

connortsui20 · 2025-08-23T13:42:01Z

library/std/src/sync/mod.rs

+/// A type indicating whether a timed wait on a condition variable returned
+/// due to a time out or not.
+///
+/// It is returned by the [`wait_timeout`] method.
+///
+/// [`wait_timeout`]: Condvar::wait_timeout
+#[derive(Debug, PartialEq, Eq, Copy, Clone)]
+#[stable(feature = "wait_timeout", since = "1.5.0")]
+pub struct WaitTimeoutResult(bool);


Not actually sure that this is the best place to put it, but I do think this is still better than leaving it in poison

This makes sense to me.

connortsui20 · 2025-08-23T13:45:32Z

library/std/src/sync/nonpoison/condvar.rs

For reviewers: since this is a semi-large file, it might be good to compare this directly with the poison::condvar module (with the additional reorganizations made in the first commit)

(for copy paste)

delta library/std/src/sync/poison/condvar.rs library/std/src/sync/nonpoison/condvar.rs

diff library/std/src/sync/poison/condvar.rs library/std/src/sync/nonpoison/condvar.rs

connortsui20 · 2025-08-23T13:47:01Z

library/std/tests/sync/condvar.rs

+nonpoison_and_poison_unwrap_test!(
+    name: test_mutex_arc_condvar,
+    test_body: {


This test was stolen from mutex.rs.

Other than that, there are no "new" tests here (just refactors to use the macro)

…acrum Implementation: `#[feature(nonpoison_rwlock)]` Tracking Issue: rust-lang/rust#134645 This PR continues the effort made in rust-lang/rust#144022 by adding the implementation of `nonpoison::rwlock`. Many of the changes here are similar to the changes made to implement `nonpoison::mutex`. The only real difference is that this PR includes a reorganizing of the existing `poison::rwlock` file that hopefully makes both variants more readable. ### Related PRs - `nonpoison_condvar` implementation: rust-lang/rust#144651 - `nonpoison_once` implementation: rust-lang/rust#144653

…ark-Simulacrum Implementation: `#[feature(nonpoison_rwlock)]` Tracking Issue: rust-lang#134645 This PR continues the effort made in rust-lang#144022 by adding the implementation of `nonpoison::rwlock`. Many of the changes here are similar to the changes made to implement `nonpoison::mutex`. The only real difference is that this PR includes a reorganizing of the existing `poison::rwlock` file that hopefully makes both variants more readable. ### Related PRs - `nonpoison_condvar` implementation: rust-lang#144651 - `nonpoison_once` implementation: rust-lang#144653

joboet · 2025-08-30T08:46:38Z

@bors r+
r? joboet

bors · 2025-08-30T08:46:41Z

📌 Commit d210ce7 has been approved by joboet

It is now in the queue for this repository.

Rollup of 5 pull requests Successful merges: - #143462 (fix(lib-std-fs): handle `usize` overflow in `read*`) - #144651 (Implementation: `#[feature(nonpoison_condvar)]`) - #145465 (Stabilize `array_repeat` feature) - #145776 (Optimize `.ilog({2,10})` to `.ilog{2,10}()`) - #145969 (Add Duration::from_nanos_u128) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #144651 - connortsui20:nonpoison_condvar, r=joboet Implementation: `#[feature(nonpoison_condvar)]` Tracking Issue: #134645 This PR continues the effort made in #144022 by adding the implementation of `nonpoison::condvar`. Many of the changes here are similar to the changes made to implement `nonpoison::mutex`. There are two other changes here. The first is that the `Barrier` implementation is migrated to use the `nonpoison::Condvar` instead of the `poison` variant. The second (which might be subject to some discussion) is that `WaitTimeoutResult` is moved up to `mod.rs`, as both `condvar` variants need that type (and I do not know if there is a better place to put it now). ### Related PRs - `nonpoison_rwlock` implementation: #144648 - `nonpoison_once` implementation: #144653

…joboet Implementation: `#[feature(nonpoison_condvar)]` Tracking Issue: rust-lang#134645 This PR continues the effort made in rust-lang#144022 by adding the implementation of `nonpoison::condvar`. Many of the changes here are similar to the changes made to implement `nonpoison::mutex`. There are two other changes here. The first is that the `Barrier` implementation is migrated to use the `nonpoison::Condvar` instead of the `poison` variant. The second (which might be subject to some discussion) is that `WaitTimeoutResult` is moved up to `mod.rs`, as both `condvar` variants need that type (and I do not know if there is a better place to put it now). ### Related PRs - `nonpoison_rwlock` implementation: rust-lang#144648 - `nonpoison_once` implementation: rust-lang#144653

rustbot assigned thomcc Jul 29, 2025

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 Jul 29, 2025

connortsui20 changed the title ~~Nonpoison condvar~~ Implementation: #[feature(nonpoison_condvar)] Jul 29, 2025

connortsui20 changed the title ~~Implementation: #[feature(nonpoison_condvar)]~~ Implementation: #[feature(nonpoison_condvar)] Jul 29, 2025

This was referenced Jul 29, 2025

Implementation: #[feature(nonpoison_rwlock)] #144648

Merged

Implementation: #[feature(nonpoison_once)] #144653

Closed

add nonpoison::condvar implementation

eaf7fd2

Adds the equivalent `nonpoison` types to the `poison::condvar` module. These types and implementations are gated under the `nonpoison_condvar` feature gate. Signed-off-by: Connor Tsui <connor.tsui20@gmail.com>

rustbot assigned tgross35 and unassigned thomcc Aug 23, 2025

connortsui20 added 3 commits August 23, 2025 09:20

change Barrier implementation to use nonpoison::Condvar

a8163bd

Signed-off-by: Connor Tsui <connor.tsui20@gmail.com>

move WaitTimeoutResult up to mod.rs

b8ee38b

Since `WaitTimeoutResult` is poison-agnostic, we want to use the same type for both variants of `Condvar`. Signed-off-by: Connor Tsui <connor.tsui20@gmail.com>

connortsui20 force-pushed the nonpoison_condvar branch from de36753 to b8ee38b Compare August 23, 2025 13:21

fix visibility of private getters

d210ce7

Signed-off-by: Connor Tsui <connor.tsui20@gmail.com>

connortsui20 commented Aug 23, 2025

View reviewed changes

connortsui20 mentioned this pull request Aug 23, 2025

oneshot Channel #143741

Merged

5 tasks

mati865 mentioned this pull request Aug 23, 2025

Add socket extensions for cygwin #139524

Merged

rustbot assigned joboet Aug 30, 2025

rustbot unassigned tgross35 Aug 30, 2025

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 30, 2025

Zalathar mentioned this pull request Aug 30, 2025

Rollup of 5 pull requests #146026

Merged

bors merged commit eda6dc9 into rust-lang:master Aug 30, 2025
10 checks passed

rustbot added this to the 1.91.0 milestone Aug 30, 2025

weiznich mentioned this pull request Sep 1, 2025

std::sync::barrier::BarrierState is not RefUnwindSafe anymore #146087

Closed

tgross35 mentioned this pull request Sep 17, 2025

Tracking Issue for sync_nonpoison and nonpoison_{condvar,mutex,rwlock} #134645

Open

8 tasks

connortsui20 deleted the nonpoison_condvar branch October 28, 2025 15:48

Uh oh!

Conversation

connortsui20 commented Jul 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Related PRs

Uh oh!

rustbot commented Jul 29, 2025

Uh oh!

bors commented Aug 23, 2025

Uh oh!

tgross35 commented Aug 23, 2025

Uh oh!

rustbot commented Aug 23, 2025

Uh oh!

tgross35 commented Aug 23, 2025

Uh oh!

rustbot commented Aug 23, 2025

Uh oh!

connortsui20 Aug 23, 2025

Choose a reason for hiding this comment

Uh oh!

joboet Aug 30, 2025

Choose a reason for hiding this comment

Uh oh!

connortsui20 Aug 23, 2025

Choose a reason for hiding this comment

Uh oh!

connortsui20 Aug 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

joboet commented Aug 30, 2025

Uh oh!

bors commented Aug 30, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

connortsui20 commented Jul 29, 2025 •

edited

Loading

connortsui20 Aug 23, 2025 •

edited

Loading