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

connortsui20 · 2025-07-29T17:45:30Z

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: Implementation: #[feature(nonpoison_condvar)] #144651
nonpoison_once implementation: Implementation: #[feature(nonpoison_once)] #144653

rustbot · 2025-07-29T17:45:35Z

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
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

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

connortsui20 · 2025-07-30T09:22:19Z

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

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.rs

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

bors · 2025-08-09T00:10:50Z

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

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

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.

Mark-Simulacrum · 2025-08-22T12:56:36Z

@bors r+

bors · 2025-08-22T12:56:39Z

📌 Commit ad499d0 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

…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 of 20 pull requests Successful merges: - #132087 (Fix overly restrictive lifetime in `core::panic::Location::file` return type) - #137396 (Recover `param: Ty = EXPR`) - #142185 (Convert moves of references to copies in ReferencePropagation) - #144443 (Make target pointer width in target json an integer) - #144648 (Implementation: `#[feature(nonpoison_rwlock)]`) - #144897 (print raw lifetime idents with r#) - #145218 ([Debuginfo] improve enum value formatting in LLDB for better readability) - #145380 (Add codegen-llvm regression tests) - #145573 (Add an experimental unsafe(force_target_feature) attribute.) - #145597 (resolve: Remove `ScopeSet::Late`) - #145641 (On E0277, point at type that doesn't implement bound) - #145669 (rustdoc-search: GUI tests check for `//` in URL) - #145695 (Introduce ProjectionElem::try_map.) - #145710 (Fix the ABI parameter inconsistency issue in debug.rs for LoongArch64) - #145726 (Experiment: Reborrow trait) - #145731 (Make raw pointers work in type-based search) - #145736 (triagebot: Update style team reviewers) - #145738 (Uplift rustc_mir_transform::coverage::counters::union_find to rustc_data_structures.) - #145743 (doc: fix some typos in comment) - #145745 (tests: Ignore basic-stepping.rs on LoongArch) Failed merges: - #145670 (port `sanitize` attribute to the new parsing infrastructure) r? `@ghost` `@rustbot` modify labels: rollup

Rollup of 28 pull requests Successful merges: - #132087 (Fix overly restrictive lifetime in `core::panic::Location::file` return type) - #137396 (Recover `param: Ty = EXPR`) - #137457 (Fix host code appearing in Wasm binaries) - #142185 (Convert moves of references to copies in ReferencePropagation) - #144648 (Implementation: `#[feature(nonpoison_rwlock)]`) - #144897 (print raw lifetime idents with r#) - #145218 ([Debuginfo] improve enum value formatting in LLDB for better readability) - #145380 (Add codegen-llvm regression tests) - #145573 (Add an experimental unsafe(force_target_feature) attribute.) - #145597 (resolve: Remove `ScopeSet::Late`) - #145633 (Fix some typos in LocalKey documentation) - #145641 (On E0277, point at type that doesn't implement bound) - #145669 (rustdoc-search: GUI tests check for `//` in URL) - #145695 (Introduce ProjectionElem::try_map.) - #145710 (Fix the ABI parameter inconsistency issue in debug.rs for LoongArch64) - #145726 (Experiment: Reborrow trait) - #145731 (Make raw pointers work in type-based search) - #145736 (triagebot: Update style team reviewers) - #145738 (Uplift rustc_mir_transform::coverage::counters::union_find to rustc_data_structures.) - #145742 (rustdoc js: Even more typechecking improvments ) - #145743 (doc: fix some typos in comment) - #145745 (tests: Ignore basic-stepping.rs on LoongArch) - #145747 (Refactor lint buffering to avoid requiring a giant enum) - #145751 (fix(lexer): Allow '-' in the frontmatter infostring continue set) - #145761 (Add aarch64_be-unknown-hermit target) - #145762 (convert strings to symbols in attr diagnostics) - #145763 (Ship LLVM tools for the correct target when cross-compiling) - #145765 (Revert suggestions for missing methods in tuples) r? `@ghost` `@rustbot` modify labels: rollup

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

Rollup of 28 pull requests Successful merges: - rust-lang/rust#132087 (Fix overly restrictive lifetime in `core::panic::Location::file` return type) - rust-lang/rust#137396 (Recover `param: Ty = EXPR`) - rust-lang/rust#137457 (Fix host code appearing in Wasm binaries) - rust-lang/rust#142185 (Convert moves of references to copies in ReferencePropagation) - rust-lang/rust#144648 (Implementation: `#[feature(nonpoison_rwlock)]`) - rust-lang/rust#144897 (print raw lifetime idents with r#) - rust-lang/rust#145218 ([Debuginfo] improve enum value formatting in LLDB for better readability) - rust-lang/rust#145380 (Add codegen-llvm regression tests) - rust-lang/rust#145573 (Add an experimental unsafe(force_target_feature) attribute.) - rust-lang/rust#145597 (resolve: Remove `ScopeSet::Late`) - rust-lang/rust#145633 (Fix some typos in LocalKey documentation) - rust-lang/rust#145641 (On E0277, point at type that doesn't implement bound) - rust-lang/rust#145669 (rustdoc-search: GUI tests check for `//` in URL) - rust-lang/rust#145695 (Introduce ProjectionElem::try_map.) - rust-lang/rust#145710 (Fix the ABI parameter inconsistency issue in debug.rs for LoongArch64) - rust-lang/rust#145726 (Experiment: Reborrow trait) - rust-lang/rust#145731 (Make raw pointers work in type-based search) - rust-lang/rust#145736 (triagebot: Update style team reviewers) - rust-lang/rust#145738 (Uplift rustc_mir_transform::coverage::counters::union_find to rustc_data_structures.) - rust-lang/rust#145742 (rustdoc js: Even more typechecking improvments ) - rust-lang/rust#145743 (doc: fix some typos in comment) - rust-lang/rust#145745 (tests: Ignore basic-stepping.rs on LoongArch) - rust-lang/rust#145747 (Refactor lint buffering to avoid requiring a giant enum) - rust-lang/rust#145751 (fix(lexer): Allow '-' in the frontmatter infostring continue set) - rust-lang/rust#145761 (Add aarch64_be-unknown-hermit target) - rust-lang/rust#145762 (convert strings to symbols in attr diagnostics) - rust-lang/rust#145763 (Ship LLVM tools for the correct target when cross-compiling) - rust-lang/rust#145765 (Revert suggestions for missing methods in tuples) r? `@ghost` `@rustbot` modify labels: rollup

…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 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

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

RalfJung · 2025-09-11T08:03:31Z

library/std/tests/sync/rwlock.rs

 #[cfg_attr(all(miri, target_os = "macos"), ignore)]
-fn frob() {
-    const N: u32 = 10;
-    const M: usize = if cfg!(miri) { 100 } else { 1000 };
+nonpoison_and_poison_unwrap_test!(


This does not work, the ignore attribute does not end up getting applied properly.

rwlock tests: fix miri macos test regression rust-lang#144648 broke the attributes that ignore the tests on Miri; this patch should fix that.

…r=RalfJung fix cfg for poison test macro Fixes test regression in rust-lang#144648 Continuation of rust-lang#146433 I think this is right? Not really sure how to test this myself to be honest. r? `@RalfJung` I'll also leave the improvement to the test macro for a separate PR (described [here](rust-lang#146433 (comment))) since I've never done something like that before. Though since this fixes all of the tests, it might not be necessary since anyone in the future will see the `cfg()` and not `cfg_attr()`?

rwlock tests: fix miri macos test regression rust-lang#144648 broke the attributes that ignore the tests on Miri; this patch should fix that.

…r=RalfJung fix cfg for poison test macro Fixes test regression in rust-lang#144648 Continuation of rust-lang#146433 I think this is right? Not really sure how to test this myself to be honest. r? ``@RalfJung`` I'll also leave the improvement to the test macro for a separate PR (described [here](rust-lang#146433 (comment))) since I've never done something like that before. Though since this fixes all of the tests, it might not be necessary since anyone in the future will see the `cfg()` and not `cfg_attr()`?

rwlock tests: fix miri macos test regression rust-lang#144648 broke the attributes that ignore the tests on Miri; this patch should fix that.

…r=RalfJung fix cfg for poison test macro Fixes test regression in rust-lang#144648 Continuation of rust-lang#146433 I think this is right? Not really sure how to test this myself to be honest. r? ```@RalfJung``` I'll also leave the improvement to the test macro for a separate PR (described [here](rust-lang#146433 (comment))) since I've never done something like that before. Though since this fixes all of the tests, it might not be necessary since anyone in the future will see the `cfg()` and not `cfg_attr()`?

Rollup merge of #146439 - connortsui20:fix-sync-macro-attr, r=RalfJung fix cfg for poison test macro Fixes test regression in #144648 Continuation of #146433 I think this is right? Not really sure how to test this myself to be honest. r? ```@RalfJung``` I'll also leave the improvement to the test macro for a separate PR (described [here](#146433 (comment))) since I've never done something like that before. Though since this fixes all of the tests, it might not be necessary since anyone in the future will see the `cfg()` and not `cfg_attr()`?

Rollup merge of #146433 - RalfJung:rwlock-miri, r=tgross35 rwlock tests: fix miri macos test regression #144648 broke the attributes that ignore the tests on Miri; this patch should fix that.

rwlock tests: fix miri macos test regression rust-lang/rust#144648 broke the attributes that ignore the tests on Miri; this patch should fix that.

fix cfg for poison test macro Fixes test regression in rust-lang/rust#144648 Continuation of rust-lang/rust#146433 I think this is right? Not really sure how to test this myself to be honest. r? ```@RalfJung``` I'll also leave the improvement to the test macro for a separate PR (described [here](rust-lang/rust#146433 (comment))) since I've never done something like that before. Though since this fixes all of the tests, it might not be necessary since anyone in the future will see the `cfg()` and not `cfg_attr()`?

rwlock tests: fix miri macos test regression rust-lang#144648 broke the attributes that ignore the tests on Miri; this patch should fix that.

…r=RalfJung fix cfg for poison test macro Fixes test regression in rust-lang#144648 Continuation of rust-lang#146433 I think this is right? Not really sure how to test this myself to be honest. r? ```@RalfJung``` I'll also leave the improvement to the test macro for a separate PR (described [here](rust-lang#146433 (comment))) since I've never done something like that before. Though since this fixes all of the tests, it might not be necessary since anyone in the future will see the `cfg()` and not `cfg_attr()`?

rustbot assigned Mark-Simulacrum Jul 29, 2025

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Jul 29, 2025

This comment has been minimized.

Sign in to view

connortsui20 force-pushed the nonpoison_rwlock branch from 135e052 to 3bdfb3a Compare July 29, 2025 20:01

This was referenced Jul 29, 2025

Implementation: #[feature(nonpoison_condvar)] #144651

Merged

Implementation: #[feature(nonpoison_once)] #144653

Closed

EFanZh reviewed Jul 30, 2025

View reviewed changes

library/std/src/sync/nonpoison/rwlock.rs Show resolved Hide resolved

connortsui20 force-pushed the nonpoison_rwlock branch from 3bdfb3a to 21a0262 Compare July 30, 2025 09:18

connortsui20 commented Jul 30, 2025

View reviewed changes

connortsui20 added 4 commits August 9, 2025 08:16

reorganize rwlock tests

d8a0df0

This commit simply helps discern the actual changes needed to test both poison and nonpoison `rwlock`s.

add nonpoison and poison rwlock tests

ad499d0

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 21a0262 to ad499d0 Compare August 9, 2025 06:42

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

jhpratt mentioned this pull request Aug 22, 2025

Rollup of 20 pull requests #145764

Closed

jhpratt mentioned this pull request Aug 23, 2025

Rollup of 28 pull requests #145773

Merged

bors merged commit 2bd3922 into rust-lang:master Aug 23, 2025
10 checks passed

rustbot added this to the 1.91.0 milestone Aug 23, 2025

connortsui20 deleted the nonpoison_rwlock branch August 23, 2025 12:42

RalfJung reviewed Sep 11, 2025

View reviewed changes

RalfJung mentioned this pull request Sep 11, 2025

rwlock tests: fix miri macos test regression #146433

Merged

connortsui20 mentioned this pull request Sep 11, 2025

fix cfg for poison test macro #146439

Merged

tgross35 mentioned this pull request Sep 17, 2025

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

Open

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Implementation: `#[feature(nonpoison_rwlock)]`#144648

Implementation: `#[feature(nonpoison_rwlock)]`#144648
bors merged 4 commits intorust-lang:masterfrom
connortsui20:nonpoison_rwlock

connortsui20 commented Jul 29, 2025 •

edited

Loading

Uh oh!

rustbot commented Jul 29, 2025

Uh oh!

This comment has been minimized.

Uh oh!

connortsui20 Jul 30, 2025

Uh oh!

bors commented Aug 9, 2025

Uh oh!

Mark-Simulacrum commented Aug 22, 2025

Uh oh!

bors commented Aug 22, 2025

Uh oh!

Uh oh!

RalfJung Sep 11, 2025 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

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!

This comment has been minimized.

Uh oh!

connortsui20 Jul 30, 2025

Choose a reason for hiding this comment

Uh oh!

bors commented Aug 9, 2025

Uh oh!

Mark-Simulacrum commented Aug 22, 2025

Uh oh!

bors commented Aug 22, 2025

Uh oh!

Uh oh!

RalfJung Sep 11, 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!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

connortsui20 commented Jul 29, 2025 •

edited

Loading

RalfJung Sep 11, 2025 •

edited

Loading