Implementation: #[feature(nonpoison_rwlock)]
#144648
Open
+1,996
−752
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
This commit is a purely cosmetic change to the documentation and ordering of items in the `rwlock.rs` file, which will help discern the actual difference between the `nonpoison` and `poison` variants of `rwlock`. List of changes (lots of small things): - Clean up some of the existing field doc comments - Add documentation for every field in struct definitions - Consolidate related implementation blocks (1 implementation block per guard instead of 2) - Use the lifetime name `'rwlock` instead of `'a` - Reorder implementation blocks to be consistent across the entire file (follows the order `ReadGuard`, `WriteGuard`, `MappedReadGuard`, MappedWriteGuard`) - Move simple trait implementations to the bottom of the file - Rename the `poison` field in `MappedRwLockWriteGuard` to posion_guard` - Cut off comments at 100 columns - Update the documentation of `downgrade` to match stabilization PR # 143191
|
rustbot has assigned @Mark-Simulacrum. Use |
rustbot
added
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
connortsui20
force-pushed
the
nonpoison_rwlock
branch
from
135e052 to
3bdfb3a
Compare
This was referenced Jul 29, 2025
EFanZh
reviewed
Jul 30, 2025
Adds the equivalent `nonpoison` types to the `poison::rwlock` module. These types and implementations are gated under the `nonpoison_rwlock` feature gate. Also blesses the ui tests that now have a name conflicts (because these types no longer have unique names). The full path distinguishes the different types.
This commit simply helps discern the actual changes needed to test both poison and nonpoison `rwlock`s.
Adds tests for the `nonpoison::RwLock` 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.
connortsui20
force-pushed
the
nonpoison_rwlock
branch
from
3bdfb3a to
21a0262
Compare
connortsui20
commented
Jul 30, 2025
There was a problem hiding this comment.
For reviewers: since this is a large file, it might be good to compare this directly with the poison::rwlock module (with the additional reorganizations made in the first commit)
(for copy paste)
delta library/std/src/sync/poison/rwlock.rs library/std/src/sync/nonpoison/rwlock.rsdiff library/std/src/sync/poison/rwlock.rs library/std/src/sync/nonpoison/rwlock.rs
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::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 existingpoison::rwlockfile that hopefully makes both variants more readable.Related PRs
nonpoison_condvarimplementation: Implementation:#[feature(nonpoison_condvar)]#144651nonpoison_onceimplementation: Implementation:#[feature(nonpoison_once)]#144653