From 21fef03da217282b484035505c1bc09a175a2eeb Mon Sep 17 00:00:00 2001
From: joboet <jonasboettiger@icloud.com>
Date: Thu, 15 Feb 2024 18:00:24 +0100
Subject: [PATCH] std: move locks to `sys` on platforms without threads

---
 library/std/src/sys/locks/condvar/mod.rs                    | 3 +++
 .../locks/condvar.rs => locks/condvar/no_threads.rs}        | 0
 library/std/src/sys/locks/mutex/mod.rs                      | 3 +++
 .../locks/mutex.rs => locks/mutex/no_threads.rs}            | 0
 library/std/src/sys/locks/rwlock/mod.rs                     | 3 +++
 .../locks/rwlock.rs => locks/rwlock/no_threads.rs}          | 0
 library/std/src/sys/pal/uefi/mod.rs                         | 2 --
 library/std/src/sys/pal/unsupported/locks/mod.rs            | 6 ------
 library/std/src/sys/pal/unsupported/mod.rs                  | 1 -
 library/std/src/sys/pal/wasi/mod.rs                         | 5 +----
 library/std/src/sys/pal/wasm/mod.rs                         | 2 --
 library/std/src/sys/pal/zkvm/mod.rs                         | 2 --
 12 files changed, 10 insertions(+), 17 deletions(-)
 rename library/std/src/sys/{pal/unsupported/locks/condvar.rs => locks/condvar/no_threads.rs} (100%)
 rename library/std/src/sys/{pal/unsupported/locks/mutex.rs => locks/mutex/no_threads.rs} (100%)
 rename library/std/src/sys/{pal/unsupported/locks/rwlock.rs => locks/rwlock/no_threads.rs} (100%)
 delete mode 100644 library/std/src/sys/pal/unsupported/locks/mod.rs

diff --git a/library/std/src/sys/locks/condvar/mod.rs b/library/std/src/sys/locks/condvar/mod.rs
index 425b88c1bf08..126a42a2a4c0 100644
--- a/library/std/src/sys/locks/condvar/mod.rs
+++ b/library/std/src/sys/locks/condvar/mod.rs
@@ -29,5 +29,8 @@ cfg_if::cfg_if! {
     } else if #[cfg(target_os = "xous")] {
         mod xous;
         pub use xous::Condvar;
+    } else {
+        mod no_threads;
+        pub use no_threads::Condvar;
     }
 }
diff --git a/library/std/src/sys/pal/unsupported/locks/condvar.rs b/library/std/src/sys/locks/condvar/no_threads.rs
similarity index 100%
rename from library/std/src/sys/pal/unsupported/locks/condvar.rs
rename to library/std/src/sys/locks/condvar/no_threads.rs
diff --git a/library/std/src/sys/locks/mutex/mod.rs b/library/std/src/sys/locks/mutex/mod.rs
index cb229d50e558..710cb91fb147 100644
--- a/library/std/src/sys/locks/mutex/mod.rs
+++ b/library/std/src/sys/locks/mutex/mod.rs
@@ -31,5 +31,8 @@ cfg_if::cfg_if! {
     } else if #[cfg(target_os = "xous")] {
         mod xous;
         pub use xous::Mutex;
+    } else {
+        mod no_threads;
+        pub use no_threads::Mutex;
     }
 }
diff --git a/library/std/src/sys/pal/unsupported/locks/mutex.rs b/library/std/src/sys/locks/mutex/no_threads.rs
similarity index 100%
rename from library/std/src/sys/pal/unsupported/locks/mutex.rs
rename to library/std/src/sys/locks/mutex/no_threads.rs
diff --git a/library/std/src/sys/locks/rwlock/mod.rs b/library/std/src/sys/locks/rwlock/mod.rs
index 9d656e57bb39..0564f1fe6fab 100644
--- a/library/std/src/sys/locks/rwlock/mod.rs
+++ b/library/std/src/sys/locks/rwlock/mod.rs
@@ -29,5 +29,8 @@ cfg_if::cfg_if! {
     } else if #[cfg(target_os = "xous")] {
         mod xous;
         pub use xous::RwLock;
+    } else {
+        mod no_threads;
+        pub use no_threads::RwLock;
     }
 }
diff --git a/library/std/src/sys/pal/unsupported/locks/rwlock.rs b/library/std/src/sys/locks/rwlock/no_threads.rs
similarity index 100%
rename from library/std/src/sys/pal/unsupported/locks/rwlock.rs
rename to library/std/src/sys/locks/rwlock/no_threads.rs
diff --git a/library/std/src/sys/pal/uefi/mod.rs b/library/std/src/sys/pal/uefi/mod.rs
index 5a96b8f1c3a0..ff8e3bd32adf 100644
--- a/library/std/src/sys/pal/uefi/mod.rs
+++ b/library/std/src/sys/pal/uefi/mod.rs
@@ -19,8 +19,6 @@ pub mod env;
 pub mod fs;
 #[path = "../unsupported/io.rs"]
 pub mod io;
-#[path = "../unsupported/locks/mod.rs"]
-pub mod locks;
 #[path = "../unsupported/net.rs"]
 pub mod net;
 #[path = "../unsupported/once.rs"]
diff --git a/library/std/src/sys/pal/unsupported/locks/mod.rs b/library/std/src/sys/pal/unsupported/locks/mod.rs
deleted file mode 100644
index 0e0f9eccb213..000000000000
--- a/library/std/src/sys/pal/unsupported/locks/mod.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-mod condvar;
-mod mutex;
-mod rwlock;
-pub use condvar::Condvar;
-pub use mutex::Mutex;
-pub use rwlock::RwLock;
diff --git a/library/std/src/sys/pal/unsupported/mod.rs b/library/std/src/sys/pal/unsupported/mod.rs
index 88f939cbab92..9ce275ee72d5 100644
--- a/library/std/src/sys/pal/unsupported/mod.rs
+++ b/library/std/src/sys/pal/unsupported/mod.rs
@@ -5,7 +5,6 @@ pub mod args;
 pub mod env;
 pub mod fs;
 pub mod io;
-pub mod locks;
 pub mod net;
 pub mod once;
 pub mod os;
diff --git a/library/std/src/sys/pal/wasi/mod.rs b/library/std/src/sys/pal/wasi/mod.rs
index 5de2e0e7d63d..084b8e0e2163 100644
--- a/library/std/src/sys/pal/wasi/mod.rs
+++ b/library/std/src/sys/pal/wasi/mod.rs
@@ -43,10 +43,7 @@ pub mod thread_local_key;
 pub mod time;
 
 cfg_if::cfg_if! {
-    if #[cfg(target_feature = "atomics")] {
-    } else {
-        #[path = "../unsupported/locks/mod.rs"]
-        pub mod locks;
+    if #[cfg(not(target_feature = "atomics"))] {
         #[path = "../unsupported/once.rs"]
         pub mod once;
         #[path = "../unsupported/thread_parking.rs"]
diff --git a/library/std/src/sys/pal/wasm/mod.rs b/library/std/src/sys/pal/wasm/mod.rs
index 910a54b2e010..40b15120e6da 100644
--- a/library/std/src/sys/pal/wasm/mod.rs
+++ b/library/std/src/sys/pal/wasm/mod.rs
@@ -48,8 +48,6 @@ cfg_if::cfg_if! {
         #[path = "atomics/thread.rs"]
         pub mod thread;
     } else {
-        #[path = "../unsupported/locks/mod.rs"]
-        pub mod locks;
         #[path = "../unsupported/once.rs"]
         pub mod once;
         #[path = "../unsupported/thread.rs"]
diff --git a/library/std/src/sys/pal/zkvm/mod.rs b/library/std/src/sys/pal/zkvm/mod.rs
index e859269831aa..016c977dc33d 100644
--- a/library/std/src/sys/pal/zkvm/mod.rs
+++ b/library/std/src/sys/pal/zkvm/mod.rs
@@ -33,8 +33,6 @@ pub mod thread_local_key;
 #[path = "../unsupported/time.rs"]
 pub mod time;
 
-#[path = "../unsupported/locks/mod.rs"]
-pub mod locks;
 #[path = "../unsupported/thread.rs"]
 pub mod thread;