move `once` module out of `poison` #147125

connortsui20 · 2025-09-28T14:05:28Z

From #134645 (comment), since Once will not have a non-poisoning variant, we remove it from the poison module.

Additionally:

Renames once::ExclusiveState to OnceExclusiveState since it was a bit confusing reading just ExclusiveState where it is used.
Reorders a few module definitions and re-exports in library/std/src/sync/mod.rs for clarity.

Also, once this is merged, I think that we can begin the process of stabilizing sync_poison_mod and sync_nonpoison

rustbot · 2025-09-28T14:05:34Z

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

connortsui20 · 2025-10-10T13:46:18Z

r? @tgross35

rustbot · 2025-10-10T13:46:24Z

tgross35 is currently at their maximum review capacity.
They may take a while to respond.

tgross35

A few nits here then r=me

Additionally:

1. Renames `once::ExclusiveState` to `OnceExclusiveState` since it was a bit confusing reading just `ExclusiveState` where it is used.
2. Reorders a few module definitions and re-exports in `library/std/src/sync/mod.rs` for clarity.

For future reference, since these and the original Once change are all orthogonal, they'd ideally be split to three separate commits. It's a separation of concerns (cleanup vs. behavior change) and makes the diffs easier to follow.

View changes since this review

library/std/src/sync/poison.rs

library/std/src/sync/mod.rs

tgross35 · 2025-10-16T22:23:04Z

library/std/src/sync/mod.rs

    Condvar,
-    Once, OnceState,
    RwLock, RwLockReadGuard, RwLockWriteGuard,
 };


Looks like alphabetical ordering may have gotten flipped between Mutex and TryLockError. (would be nice if we could just remove the rustfmt::skip from this module but it does make things messy)

I actually did this purposefully (though Condvar should probably come after RwLock now that I think about it because RwLock relies on TryLockError too). Once I finish revisions let me know if the ordering makes sense (commit 7b61403)

library/std/src/sync/mod.rs

tgross35 · 2025-10-16T22:33:50Z

@rustbot author

rustbot · 2025-10-16T22:33:54Z

Reminder, once the PR becomes ready for a review, use @rustbot ready.

It is a bit confusing when reading code that uses this type since it is not immediately obvious that it is specific to `Once`. Signed-off-by: Connor Tsui <connor.tsui20@gmail.com>

rustbot · 2025-10-17T15:40:41Z

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 <connor.tsui20@gmail.com>

Moves things around to make a bit more sense (plus prepare moving `once` out of `poison`. Signed-off-by: Connor Tsui <connor.tsui20@gmail.com>

Since `Once` will not have a non-poisoning variant, we remove it from the `poison` module. Signed-off-by: Connor Tsui <connor.tsui20@gmail.com>

connortsui20 · 2025-10-17T15:51:14Z

@rustbot ready

(Also sorry about the commit hygiene I think I was just being lazy)

tgross35 · 2025-10-20T19:09:11Z

(Also sorry about the commit hygiene I think I was just being lazy)

No worries, we don't have any commit guidelines so it's just nice to have rather than required :). Thanks for doing it now, though!

@bors r+ rollup

bors · 2025-10-20T19:09:14Z

📌 Commit 3a9c521 has been approved by tgross35

It is now in the queue for this repository.

…=tgross35 move `once` module out of `poison` From rust-lang#134645 (comment), since `Once` will not have a non-poisoning variant, we remove it from the `poison` module. Additionally: 1. Renames `once::ExclusiveState` to `OnceExclusiveState` since it was a bit confusing reading just `ExclusiveState` where it is used. 2. Reorders a few module definitions and re-exports in `library/std/src/sync/mod.rs` for clarity. Also, once this is merged, I think that we can begin the process of stabilizing [`sync_poison_mod`](rust-lang#134646)

Rollup of 3 pull requests Successful merges: - #147125 (move `once` module out of `poison`) - #147860 (rustdoc search: relax rules for identifiers) - #147910 (handle spurious returns of `wait_timeout` in test) r? `@ghost` `@rustbot` modify labels: rollup

Rollup of 5 pull requests Successful merges: - #147125 (move `once` module out of `poison`) - #147800 (Add `Cacheable` trait alias in `rustc_public_bridge`) - #147860 (rustdoc search: relax rules for identifiers) - #147916 (Update books) - #147924 (rustc-dev-guide subtree update) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #147125 - connortsui20:poison-once-remove, r=tgross35 move `once` module out of `poison` From #134645 (comment), since `Once` will not have a non-poisoning variant, we remove it from the `poison` module. Additionally: 1. Renames `once::ExclusiveState` to `OnceExclusiveState` since it was a bit confusing reading just `ExclusiveState` where it is used. 2. Reorders a few module definitions and re-exports in `library/std/src/sync/mod.rs` for clarity. Also, once this is merged, I think that we can begin the process of stabilizing [`sync_poison_mod`](#134646)

Rollup of 5 pull requests Successful merges: - rust-lang/rust#147125 (move `once` module out of `poison`) - rust-lang/rust#147800 (Add `Cacheable` trait alias in `rustc_public_bridge`) - rust-lang/rust#147860 (rustdoc search: relax rules for identifiers) - rust-lang/rust#147916 (Update books) - rust-lang/rust#147924 (rustc-dev-guide subtree update) r? `@ghost` `@rustbot` modify labels: rollup

rustbot assigned ibraheemdev Sep 28, 2025

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

rustbot assigned tgross35 and unassigned ibraheemdev Oct 10, 2025

tgross35 reviewed Oct 16, 2025

View reviewed changes

rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 16, 2025

rename once::ExclusiveState to OnceExclusiveState

a61c8be

It is a bit confusing when reading code that uses this type since it is not immediately obvious that it is specific to `Once`. Signed-off-by: Connor Tsui <connor.tsui20@gmail.com>

connortsui20 force-pushed the poison-once-remove branch from ef16d45 to dca5bc2 Compare October 17, 2025 15:40

connortsui20 added 3 commits October 17, 2025 11:43

clean up some documentation

0758e19

Signed-off-by: Connor Tsui <connor.tsui20@gmail.com>

reorganize library/std/src/sync/mod.rs file

7b61403

Moves things around to make a bit more sense (plus prepare moving `once` out of `poison`. Signed-off-by: Connor Tsui <connor.tsui20@gmail.com>

move once module out of poison

3a9c521

Since `Once` will not have a non-poisoning variant, we remove it from the `poison` module. Signed-off-by: Connor Tsui <connor.tsui20@gmail.com>

connortsui20 force-pushed the poison-once-remove branch from dca5bc2 to 3a9c521 Compare October 17, 2025 15:43

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 Oct 17, 2025

tgross35 approved these changes Oct 20, 2025

View reviewed changes

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 Oct 20, 2025

matthiaskrgr mentioned this pull request Oct 20, 2025

Rollup of 3 pull requests #147920

Closed

Zalathar mentioned this pull request Oct 21, 2025

Rollup of 5 pull requests #147928

Merged

bors merged commit 79e4669 into rust-lang:master Oct 21, 2025
11 checks passed

rustbot added this to the 1.92.0 milestone Oct 21, 2025

connortsui20 deleted the poison-once-remove branch October 28, 2025 15:48

connortsui20 mentioned this pull request Oct 28, 2025

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

Open

8 tasks

Uh oh!

move once module out of poison #147125

move once module out of poison #147125

Uh oh!

Conversation

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

Uh oh!

Uh oh!

rustbot commented Sep 28, 2025

Uh oh!

connortsui20 commented Oct 10, 2025

Uh oh!

rustbot commented Oct 10, 2025

Uh oh!

tgross35 left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

tgross35 Oct 16, 2025

Choose a reason for hiding this comment

Uh oh!

connortsui20 Oct 17, 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!

Uh oh!

tgross35 commented Oct 16, 2025

Uh oh!

rustbot commented Oct 16, 2025

Uh oh!

rustbot commented Oct 17, 2025

Uh oh!

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

Uh oh!

Uh oh!

tgross35 commented Oct 20, 2025

Uh oh!

bors commented Oct 20, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

move `once` module out of `poison` #147125

move `once` module out of `poison` #147125

connortsui20 commented Sep 28, 2025 •

edited

Loading

tgross35 left a comment •

edited by rustbot

Loading

connortsui20 Oct 17, 2025 •

edited

Loading

connortsui20 commented Oct 17, 2025 •

edited

Loading