Refactor blocking read-write lock module structure and improve assertions in ThreadModeRawRwLock

2 files changed, 12 insertions, 6 deletions

diff --git a/embassy-sync/src/blocking_rwlock/mod.rs b/embassy-sync/src/blocking_rwlock/mod.rs
index a304b77d6..a8fb7d6bc 100644
--- a/embassy-sync/src/blocking_rwlock/mod.rs
+++ b/embassy-sync/src/blocking_rwlock/mod.rs
@@ -1,11 +1,11 @@
 //! Blocking read-write lock.
 //!
 //! This module provides a blocking read-write lock that can be used to synchronize data.
-pub mod raw_rwlock;
+pub mod raw;
 
 use core::cell::UnsafeCell;
 
-use self::raw_rwlock::RawRwLock;
+use self::raw::RawRwLock;
 
 /// Blocking read-write lock (not async)
 ///
@@ -218,4 +218,4 @@ mod thread_mode_rwlock {
             // Drop of the inner `T` happens after this.
         }
     }
-}
\ No newline at end of file
+}
diff --git a/embassy-sync/src/blocking_rwlock/raw.rs b/embassy-sync/src/blocking_rwlock/raw.rs
index 85e8374b5..7725edfa5 100644
--- a/embassy-sync/src/blocking_rwlock/raw.rs
+++ b/embassy-sync/src/blocking_rwlock/raw.rs
@@ -126,13 +126,19 @@ mod thread_mode {
     unsafe impl RawRwLock for ThreadModeRawRwLock {
         const INIT: Self = Self::new();
         fn read_lock<R>(&self, f: impl FnOnce() -> R) -> R {
-            assert!(in_thread_mode(), "ThreadModeRwLock can only be locked from thread mode.");
+            assert!(
+                in_thread_mode(),
+                "ThreadModeRwLock can only be locked from thread mode."
+            );
 
             f()
         }
 
         fn write_lock<R>(&self, f: impl FnOnce() -> R) -> R {
-            assert!(in_thread_mode(), "ThreadModeRwLock can only be locked from thread mode.");
+            assert!(
+                in_thread_mode(),
+                "ThreadModeRwLock can only be locked from thread mode."
+            );
 
             f()
         }
@@ -156,4 +162,4 @@ mod thread_mode {
     }
 }
 #[cfg(any(cortex_m, feature = "std"))]
-pub use thread_mode::*;
\ No newline at end of file
+pub use thread_mode::*;