move once module out of poison

Since `Once` will not have a non-poisoning variant, we remove it from
the `poison` module.

Signed-off-by: Connor Tsui <[email protected]>

Author: connortsui20

library/std/src/sync/lazy_lock.rs

@@ -1,4 +1,4 @@
-use super::poison::once::OnceExclusiveState;
+use super::once::OnceExclusiveState;
 use crate::cell::UnsafeCell;
 use crate::mem::ManuallyDrop;
 use crate::ops::{Deref, DerefMut};

library/std/src/sync/mod.rs

@@ -185,11 +185,15 @@ pub use alloc_crate::sync::{Arc, Weak};
 pub mod mpmc;
 pub mod mpsc;
 
-// TODO: Make this `self::once::ONCE_INIT`.
+pub(crate) mod once; // `pub(crate)` for the `sys::sync::once` implementations and `LazyLock`.
+
+#[stable(feature = "rust1", since = "1.0.0")]
+pub use self::once::{Once, OnceState};
+
 #[stable(feature = "rust1", since = "1.0.0")]
 #[doc(inline)]
 #[expect(deprecated)]
-pub use self::poison::ONCE_INIT;
+pub use self::once::ONCE_INIT;
 
 mod barrier;
 mod lazy_lock;
@@ -231,7 +235,6 @@ pub use self::poison::{
     Mutex, MutexGuard,
     RwLock, RwLockReadGuard, RwLockWriteGuard,
     Condvar,
-    Once, OnceState,
 };
 
 #[unstable(feature = "mapped_lock_guards", issue = "117108")]

library/std/src/sync/poison/once.rs renamed to library/std/src/sync/once.rs

@@ -66,11 +66,6 @@ pub use self::condvar::Condvar;
 pub use self::mutex::MappedMutexGuard;
 #[stable(feature = "rust1", since = "1.0.0")]
 pub use self::mutex::{Mutex, MutexGuard};
-#[stable(feature = "rust1", since = "1.0.0")]
-#[expect(deprecated)]
-pub use self::once::ONCE_INIT;
-#[stable(feature = "rust1", since = "1.0.0")]
-pub use self::once::{Once, OnceState};
 #[unstable(feature = "mapped_lock_guards", issue = "117108")]
 pub use self::rwlock::{MappedRwLockReadGuard, MappedRwLockWriteGuard};
 #[stable(feature = "rust1", since = "1.0.0")]
@@ -85,7 +80,6 @@ use crate::thread;
 mod condvar;
 #[stable(feature = "rust1", since = "1.0.0")]
 mod mutex;
-pub(crate) mod once;
 mod rwlock;
 
 pub(crate) struct Flag {

library/std/src/sync/poison.rs

@@ -1,7 +1,7 @@
 use crate::cell::Cell;
 use crate::sync as public;
 use crate::sync::atomic::Ordering::{Acquire, Relaxed, Release};
-use crate::sync::poison::once::OnceExclusiveState;
+use crate::sync::once::OnceExclusiveState;
 use crate::sys::futex::{Futex, Primitive, futex_wait, futex_wake_all};
 
 // On some platforms, the OS is very nice and handles the waiter queue for us.

library/std/src/sys/sync/once/futex.rs

@@ -1,6 +1,6 @@
 use crate::cell::Cell;
 use crate::sync as public;
-use crate::sync::poison::once::OnceExclusiveState;
+use crate::sync::once::OnceExclusiveState;
 
 pub struct Once {
     state: Cell<State>,

library/std/src/sys/sync/once/no_threads.rs

@@ -58,7 +58,7 @@
 use crate::cell::Cell;
 use crate::sync::atomic::Ordering::{AcqRel, Acquire, Release};
 use crate::sync::atomic::{Atomic, AtomicBool, AtomicPtr};
-use crate::sync::poison::once::OnceExclusiveState;
+use crate::sync::once::OnceExclusiveState;
 use crate::thread::{self, Thread};
 use crate::{fmt, ptr, sync as public};