std: move locks to sys on platforms without threads

Author: joboet

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;
     }
 }

std/src/sys/pal/unsupported/locks/condvar.rs renamed to std/src/sys/locks/condvar/no_threads.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;
     }
 }

std/src/sys/locks/mutex/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;
     }
 }

std/src/sys/pal/unsupported/locks/mutex.rs renamed to std/src/sys/locks/mutex/no_threads.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"]

std/src/sys/locks/rwlock/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;

std/src/sys/pal/unsupported/locks/rwlock.rs renamed to std/src/sys/locks/rwlock/no_threads.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"]

std/src/sys/pal/uefi/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"]

std/src/sys/pal/unsupported/locks/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;