Implementation: `#[feature(sync_nonpoison)]`, `#[feature(nonpoison_mutex)]` #144022

connortsui20 · 2025-07-16T12:43:42Z

Continuation of #134663

Tracking Issue: #134645

This PR implements a new sync/nonpoison module, as well as the nonpoison variant of the Mutex lock.

There are 2 main changes here, the first is the new nonpoison::mutex module, and the second is the mutex integration tests.

For the nonpoison::mutex module, I did my best to align it with the current state of the poison::mutex module. This means that several unstable features (mapped_lock_guards, lock_value_accessors, and mutex_data_ptr) are also in the new nonpoison::mutex module, under their respective feature gates. Everything else in that file is under the correct feature gate (#[unstable(feature = "nonpoison_mutex", issue = "134645")]).

Everything in the nonpoison::mutex file is essentially identical in spirit, as we are simply removing the error case from the original poison::mutex.

The second big change is in the integration tests. I created a macro called that allows us to duplicate tests that are "generic" over the different mutex types, in that the poison mutex is always unwrapped.

I think that there is an argument against doing this, as it can make the tests a bit harder to understand (and language server capabilities are weaker within macros), but I think the benefit of code deduplication here is worth it. Note that it is definitely possible to generalize this (with a few tweaks) to testing the other nonpoison locks when they eventually get implemented, but I'll leave that for a later discussion.

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

library/std/tests/sync/mutex.rs

rustbot · 2025-07-18T09:23:59Z

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

tgross35 · 2025-07-18T16:40:38Z

r? tgross35

tgross35

Looks pretty good to me, most comments here are related to docs. This will need some history cleanup, there isn't any need to preserve the current state of #134663 in history (I assume this was just done for now to show what changed since then)

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

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

library/std/tests/sync/mutex.rs

library/std/tests/sync/lib.rs

library/std/src/sync/nonpoison.rs

bors · 2025-07-26T11:17:52Z

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

tgross35 · 2025-07-29T07:37:49Z

Okay, this looks great! Thank you for getting this over the line, and @Aandreba for getting it started.

Could you squash "Update UI tests" into "add nonpoison::mutex implementation"? Its description doesn't really make sense on its own. "use generic function instead of macro" should ideally also be squashed somewhere. After that, r=me

Adds the equivalent `nonpoison` types to the `poison::mutex` module. These types and implementations are gated under the `nonpoison_mutex` 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. Co-authored-by: Aandreba <[email protected]> Co-authored-by: Trevor Gross <[email protected]>

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

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.

tgross35 · 2025-07-29T08:55:52Z

Thanks!

@bors r+

bors · 2025-07-29T08:55:54Z

📌 Commit d073d29 has been approved by tgross35

It is now in the queue for this repository.

…oss35 Implementation: `#[feature(sync_nonpoison)]`, `#[feature(nonpoison_mutex)]` Continuation of rust-lang#134663 Tracking Issue: rust-lang#134645 This PR implements a new `sync/nonpoison` module, as well as the `nonpoison` variant of the `Mutex` lock. There are 2 main changes here, the first is the new `nonpoison::mutex` module, and the second is the `mutex` integration tests. For the `nonpoison::mutex` module, I did my best to align it with the current state of the `poison::mutex` module. This means that several unstable features (`mapped_lock_guards`, `lock_value_accessors`, and `mutex_data_ptr`) are also in the new `nonpoison::mutex` module, under their respective feature gates. Everything else in that file is under the correct feature gate (`#[unstable(feature = "nonpoison_mutex", issue = "134645")]`). Everything in the `nonpoison::mutex` file is essentially identical in spirit, as we are simply removing the error case from the original `poison::mutex`. The second big change is in the integration tests. I created a macro called that allows us to duplicate tests that are "generic" over the different mutex types, in that the poison mutex is always `unwrap`ped. ~~I think that there is an argument against doing this, as it can make the tests a bit harder to understand (and language server capabilities are weaker within macros), but I think the benefit of code deduplication here is worth it. Note that it is definitely possible to generalize this (with a few tweaks) to testing the other `nonpoison` locks when they eventually get implemented, but I'll leave that for a later discussion.~~

Rollup of 14 pull requests Successful merges: - #144022 (Implementation: `#[feature(sync_nonpoison)]`, `#[feature(nonpoison_mutex)]`) - #144167 (Document why `Range*<&T> as RangeBounds<T>` impls are not `T: ?Sized`, and give an alternative.) - #144407 (fix(debuginfo): disable overflow check for recursive non-enum types) - #144451 (fix: Reject upvar scrutinees for `loop_match`) - #144482 (Add explicit download methods to download module in bootstrap) - #144500 (thread name in stack overflow message) - #144511 (tidy: increase performance of auto extra checks feature) - #144586 (Update wasi-sdk to 27.0 in CI) - #144599 (bootstrap: enable tidy auto extra checks on tools profile) - #144600 (Ensure external paths passed via flags end up in rustdoc depinfo) - #144609 (feat: Right align line numbers) - #144623 (miri subtree update) - #144626 (cc dependencies: clarify comment) - #144627 (Add a test case for the issue #129882) r? `@ghost` `@rustbot` modify labels: rollup

Rollup of 13 pull requests Successful merges: - #144022 (Implementation: `#[feature(sync_nonpoison)]`, `#[feature(nonpoison_mutex)]`) - #144167 (Document why `Range*<&T> as RangeBounds<T>` impls are not `T: ?Sized`, and give an alternative.) - #144407 (fix(debuginfo): disable overflow check for recursive non-enum types) - #144451 (fix: Reject upvar scrutinees for `loop_match`) - #144482 (Add explicit download methods to download module in bootstrap) - #144500 (thread name in stack overflow message) - #144511 (tidy: increase performance of auto extra checks feature) - #144599 (bootstrap: enable tidy auto extra checks on tools profile) - #144600 (Ensure external paths passed via flags end up in rustdoc depinfo) - #144609 (feat: Right align line numbers) - #144623 (miri subtree update) - #144626 (cc dependencies: clarify comment) - #144627 (Add a test case for the issue #129882) r? `@ghost` `@rustbot` modify labels: rollup

bors · 2025-07-29T13:39:05Z

⌛ Testing commit d073d29 with merge 7278554...

Rollup merge of #144022 - connortsui20:sync_nonpoison, r=tgross35 Implementation: `#[feature(sync_nonpoison)]`, `#[feature(nonpoison_mutex)]` Continuation of #134663 Tracking Issue: #134645 This PR implements a new `sync/nonpoison` module, as well as the `nonpoison` variant of the `Mutex` lock. There are 2 main changes here, the first is the new `nonpoison::mutex` module, and the second is the `mutex` integration tests. For the `nonpoison::mutex` module, I did my best to align it with the current state of the `poison::mutex` module. This means that several unstable features (`mapped_lock_guards`, `lock_value_accessors`, and `mutex_data_ptr`) are also in the new `nonpoison::mutex` module, under their respective feature gates. Everything else in that file is under the correct feature gate (`#[unstable(feature = "nonpoison_mutex", issue = "134645")]`). Everything in the `nonpoison::mutex` file is essentially identical in spirit, as we are simply removing the error case from the original `poison::mutex`. The second big change is in the integration tests. I created a macro called that allows us to duplicate tests that are "generic" over the different mutex types, in that the poison mutex is always `unwrap`ped. ~~I think that there is an argument against doing this, as it can make the tests a bit harder to understand (and language server capabilities are weaker within macros), but I think the benefit of code deduplication here is worth it. Note that it is definitely possible to generalize this (with a few tweaks) to testing the other `nonpoison` locks when they eventually get implemented, but I'll leave that for a later discussion.~~

tgross35 · 2025-07-29T18:23:16Z

@bors r-

^ For whatever that is, it's already tested and merged

…oss35 Implementation: `#[feature(sync_nonpoison)]`, `#[feature(nonpoison_mutex)]` Continuation of rust-lang#134663 Tracking Issue: rust-lang#134645 This PR implements a new `sync/nonpoison` module, as well as the `nonpoison` variant of the `Mutex` lock. There are 2 main changes here, the first is the new `nonpoison::mutex` module, and the second is the `mutex` integration tests. For the `nonpoison::mutex` module, I did my best to align it with the current state of the `poison::mutex` module. This means that several unstable features (`mapped_lock_guards`, `lock_value_accessors`, and `mutex_data_ptr`) are also in the new `nonpoison::mutex` module, under their respective feature gates. Everything else in that file is under the correct feature gate (`#[unstable(feature = "nonpoison_mutex", issue = "134645")]`). Everything in the `nonpoison::mutex` file is essentially identical in spirit, as we are simply removing the error case from the original `poison::mutex`. The second big change is in the integration tests. I created a macro called that allows us to duplicate tests that are "generic" over the different mutex types, in that the poison mutex is always `unwrap`ped. ~~I think that there is an argument against doing this, as it can make the tests a bit harder to understand (and language server capabilities are weaker within macros), but I think the benefit of code deduplication here is worth it. Note that it is definitely possible to generalize this (with a few tweaks) to testing the other `nonpoison` locks when they eventually get implemented, but I'll leave that for a later discussion.~~

connortsui20 force-pushed the sync_nonpoison branch from b45b493 to deda5c5 Compare July 16, 2025 19:56

This comment has been minimized.

Sign in to view

connortsui20 force-pushed the sync_nonpoison branch from deda5c5 to 19b1a2c Compare July 16, 2025 20:48

This comment has been minimized.

Sign in to view

connortsui20 force-pushed the sync_nonpoison branch from 19b1a2c to a259232 Compare July 16, 2025 21:56

This comment has been minimized.

Sign in to view

connortsui20 force-pushed the sync_nonpoison branch 2 times, most recently from e130930 to 804d305 Compare July 18, 2025 08:58

connortsui20 commented Jul 18, 2025

View reviewed changes

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

connortsui20 commented Jul 18, 2025

View reviewed changes

library/std/tests/sync/mutex.rs Outdated Show resolved Hide resolved

connortsui20 force-pushed the sync_nonpoison branch from 804d305 to b615348 Compare July 18, 2025 09:15

connortsui20 marked this pull request as ready for review July 18, 2025 09:23

rustbot assigned thomcc Jul 18, 2025

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

rustbot assigned tgross35 and unassigned thomcc Jul 18, 2025

connortsui20 mentioned this pull request Jul 19, 2025

Tracking Issue for lock_value_accessors #133407

Open

4 tasks

connortsui20 force-pushed the sync_nonpoison branch 5 times, most recently from 35fc4df to 71395b1 Compare July 22, 2025 12:49

tgross35 requested changes Jul 23, 2025

View reviewed changes

rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 23, 2025

EFanZh reviewed Jul 25, 2025

View reviewed changes

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

connortsui20 force-pushed the sync_nonpoison branch from 19ab767 to ac48789 Compare July 26, 2025 11:23

tgross35 approved these changes Jul 29, 2025

View reviewed changes

connortsui20 and others added 5 commits July 29, 2025 10:32

clean up existing poison files

ec4dc1c

reorder mutex tests

f34fb05

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

add nonpoison and poison mutex tests

3eb722e

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.

add extra drop, panic, and unwind tests

d073d29

connortsui20 force-pushed the sync_nonpoison branch from ac48789 to d073d29 Compare July 29, 2025 08:47

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

Zalathar mentioned this pull request Jul 29, 2025

Rollup of 14 pull requests #144628

Closed

Zalathar mentioned this pull request Jul 29, 2025

Rollup of 13 pull requests #144633

Merged

bors merged commit 4bc1b98 into rust-lang:master Jul 29, 2025
10 checks passed

rustbot added this to the 1.90.0 milestone Jul 29, 2025

connortsui20 deleted the sync_nonpoison branch July 29, 2025 15:15

connortsui20 mentioned this pull request Jul 29, 2025

Implementation: #[feature(nonpoison_rwlock)] #144648

Open

This was referenced Jul 29, 2025

Implementation: #[feature(nonpoison_condvar)] #144651

Open

Implementation: #[feature(nonpoison_once)] #144653

Open

Implementation: #[feature(sync_nonpoison)], #[feature(nonpoison_mutex)] #144022

Implementation: #[feature(sync_nonpoison)], #[feature(nonpoison_mutex)] #144022

Conversation

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

Uh oh!

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

Uh oh!

Uh oh!

rustbot commented Jul 18, 2025

Uh oh!

tgross35 commented Jul 18, 2025

Uh oh!

tgross35 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

bors commented Jul 26, 2025

Uh oh!

tgross35 commented Jul 29, 2025

Uh oh!

tgross35 commented Jul 29, 2025

Uh oh!

bors commented Jul 29, 2025

Uh oh!

Uh oh!

bors commented Jul 29, 2025

Uh oh!

tgross35 commented Jul 29, 2025

Uh oh!

Uh oh!

Implementation: `#[feature(sync_nonpoison)]`, `#[feature(nonpoison_mutex)]` #144022

Implementation: `#[feature(sync_nonpoison)]`, `#[feature(nonpoison_mutex)]` #144022

connortsui20 commented Jul 16, 2025 •

edited

Loading