Implementation: #[feature(nonpoison_condvar)]
#144651
Open
+771
−271
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
S-waiting-on-review
connortsui20
changed the title
connortsui20
changed the title
#[feature(nonpoison_condvar)]
This was referenced Jul 29, 2025
jhpratt
added a commit
to jhpratt/rust
that referenced
this pull request
Aug 22, 2025
…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
jhpratt
added a commit
to jhpratt/rust
that referenced
this pull request
Aug 23, 2025
…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
rust-timer
added a commit
that referenced
this pull request
Aug 23, 2025
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
|
☔ 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 <[email protected]>
|
I believe Thom has been out r? Libs |
|
Failed to set assignee to
|
|
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 <[email protected]>
Signed-off-by: Connor Tsui <[email protected]>
Since `WaitTimeoutResult` is poison-agnostic, we want to use the same type for both variants of `Condvar`. Signed-off-by: Connor Tsui <[email protected]>
connortsui20
force-pushed
the
nonpoison_condvar
branch
from
de36753 to
b8ee38b
Compare
|
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 <[email protected]>
connortsui20
commented
Aug 23, 2025
Comment on lines
+238
to
+246
| /// 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); |
There was a problem hiding this comment.
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
connortsui20
commented
Aug 23, 2025
There was a problem hiding this comment.
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.rsdiff library/std/src/sync/poison/condvar.rs library/std/src/sync/nonpoison/condvar.rs
connortsui20
commented
Aug 23, 2025
Comment on lines
+83
to
+85
| nonpoison_and_poison_unwrap_test!( | ||
| name: test_mutex_arc_condvar, | ||
| test_body: { |
There was a problem hiding this comment.
This test was stolen from mutex.rs.
Other than that, there are no "new" tests here (just refactors to use the macro)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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
Barrierimplementation is migrated to use thenonpoison::Condvarinstead of thepoisonvariant. The second (which might be subject to some discussion) is thatWaitTimeoutResultis moved up tomod.rs, as bothcondvarvariants need that type (and I do not know if there is a better place to put it now).Related PRs
nonpoison_rwlockimplementation: Implementation:#[feature(nonpoison_rwlock)]#144648nonpoison_onceimplementation: Implementation:#[feature(nonpoison_once)]#144653