refactor(threads): sync submodule

examples/core-sizes/src/main.rs

@@ -7,8 +7,8 @@ use riot_rs::debug::{exit, log::*, EXIT_SUCCESS};
 #[riot_rs::thread(autostart)]
 fn main() {
     info!(
-        "riot_rs::thread::lock::Lock: {}",
-        core::mem::size_of::<riot_rs::thread::lock::Lock>(),
+        "riot_rs::thread::sync::Lock: {}",
+        core::mem::size_of::<riot_rs::thread::sync::Lock>(),
     );
     info!(
         "riot_rs::thread::Thread: {}",

examples/threading-channel/src/main.rs

@@ -3,7 +3,7 @@
 #![feature(used_with_arg)]
 
 use riot_rs::debug::log::*;
-use riot_rs::thread::channel::Channel;
+use riot_rs::thread::sync::Channel;
 
 static CHANNEL: Channel<u8> = Channel::new();
 

src/riot-rs-threads/src/lib.rs

@@ -17,8 +17,8 @@
 //! # Synchronization
 //!
 //! The `threading` module supports three basic synchronization primitives:
-//! - [`Channel`](channel::Channel): synchronous (blocking) channel for sending data between threads
-//! - [`Lock`](lock::Lock): basic locking object
+//! - [`Channel`](sync::Channel): synchronous (blocking) channel for sending data between threads
+//! - [`Lock`](sync::Lock): basic locking object
 //! - [`thread_flags`]: thread-flag implementation for signaling between threads
 
 #![cfg_attr(not(test), no_std)]
@@ -35,8 +35,7 @@ mod ensure_once;
 mod thread;
 mod threadlist;
 
-pub mod channel;
-pub mod lock;
+pub mod sync;
 pub mod thread_flags;
 
 #[doc(hidden)]

src/riot-rs-threads/src/lock.rs → src/riot-rs-threads/src/sync/lock.rs

@@ -1,8 +1,7 @@
 //! This module provides a Lock implementation.
 use core::cell::UnsafeCell;
 
-use super::threadlist::ThreadList;
-use super::ThreadState;
+use crate::{threadlist::ThreadList, ThreadState};
 
 /// A basic locking object.
 ///

src/riot-rs-threads/src/sync/mod.rs

@@ -0,0 +1,6 @@
+//! Synchronization primitives.
+mod channel;
+mod lock;
+
+pub use channel::Channel;
+pub use lock::Lock;

src/riot-rs-threads/src/thread.rs

@@ -41,9 +41,9 @@ pub enum ThreadState {
     LockBlocked,
     /// Waiting for [`ThreadFlags`] to be set.
     FlagBlocked(crate::thread_flags::WaitMode),
-    /// Waiting to receive on a [`super::channel::Channel`], i.e. waiting for the sender.
+    /// Waiting to receive on a [`crate::sync::Channel`], i.e. waiting for the sender.
     ChannelRxBlocked(usize),
-    /// Waiting to send on a [`super::channel::Channel`], i.e. waiting for the receiver.
+    /// Waiting to send on a [`crate::sync::Channel`], i.e. waiting for the receiver.
     ChannelTxBlocked(usize),
 }
 

tests/threading-lock/src/main.rs

@@ -4,7 +4,7 @@
 #![feature(used_with_arg)]
 
 use portable_atomic::{AtomicUsize, Ordering};
-use riot_rs::thread::{lock::Lock, thread_flags, ThreadId};
+use riot_rs::thread::{sync::Lock, thread_flags, ThreadId};
 
 static LOCK: Lock = Lock::new();
 static RUN_ORDER: AtomicUsize = AtomicUsize::new(0);