Skip to content

Conversation

@connortsui20
Copy link
Contributor

@connortsui20 connortsui20 commented Jul 16, 2025

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.

@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. 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 16, 2025
@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@connortsui20 connortsui20 force-pushed the sync_nonpoison branch 2 times, most recently from e130930 to 804d305 Compare July 18, 2025 08:58
@connortsui20 connortsui20 marked this pull request as ready for review July 18, 2025 09:23
@rustbot
Copy link
Collaborator

rustbot commented Jul 18, 2025

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

@rustbot 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
@tgross35
Copy link
Contributor

r? tgross35

@rustbot rustbot assigned tgross35 and unassigned thomcc Jul 18, 2025
@connortsui20 connortsui20 force-pushed the sync_nonpoison branch 5 times, most recently from 35fc4df to 71395b1 Compare July 22, 2025 12:49
Copy link
Contributor

@tgross35 tgross35 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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)

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

bors commented Jul 29, 2025

📌 Commit d073d29 has been approved by tgross35

It is now in the queue for this repository.

@bors 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
@bors bors merged commit 4bc1b98 into rust-lang:master Jul 29, 2025
10 checks passed
@rustbot rustbot added this to the 1.90.0 milestone Jul 29, 2025
@bors
Copy link
Collaborator

bors commented Jul 29, 2025

⌛ Testing commit d073d29 with merge 7278554...

@tgross35
Copy link
Contributor

@bors r-

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. 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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants