sync: flatten module structure.

7 files changed, 6 insertions, 9 deletions

diff --git a/embassy-sync/src/channel/mpmc.rs b/embassy-sync/src/channel.rs
index 7bebd3412..76f42d0e7 100644
--- a/embassy-sync/src/channel/mpmc.rs
+++ b/embassy-sync/src/channel.rs
@@ -373,7 +373,7 @@ where
     /// Establish a new bounded channel. For example, to create one with a NoopMutex:
     ///
     /// ```
-    /// use embassy_sync::channel::mpmc::Channel;
+    /// use embassy_sync::channel::Channel;
     /// use embassy_sync::blocking_mutex::raw::NoopRawMutex;
     ///
     /// // Declare a bounded channel of 3 u32s.
diff --git a/embassy-sync/src/channel/mod.rs b/embassy-sync/src/channel/mod.rs
deleted file mode 100644
index 5df1f5c5c..000000000
--- a/embassy-sync/src/channel/mod.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-//! Async channels
-
-pub mod mpmc;
-pub mod pubsub;
-pub mod signal;
diff --git a/embassy-sync/src/lib.rs b/embassy-sync/src/lib.rs
index 7d8815903..8e81e5cbe 100644
--- a/embassy-sync/src/lib.rs
+++ b/embassy-sync/src/lib.rs
@@ -14,4 +14,6 @@ pub mod blocking_mutex;
 pub mod channel;
 pub mod mutex;
 pub mod pipe;
+pub mod pubsub;
+pub mod signal;
 pub mod waitqueue;
diff --git a/embassy-sync/src/channel/pubsub/mod.rs b/embassy-sync/src/pubsub/mod.rs
index f62b4d118..62a9e4763 100644
--- a/embassy-sync/src/channel/pubsub/mod.rs
+++ b/embassy-sync/src/pubsub/mod.rs
@@ -34,8 +34,8 @@ pub use subscriber::{DynSubscriber, Subscriber};
 ///
 /// ```
 /// # use embassy_sync::blocking_mutex::raw::NoopRawMutex;
-/// # use embassy_sync::channel::pubsub::WaitResult;
-/// # use embassy_sync::channel::pubsub::PubSubChannel;
+/// # use embassy_sync::pubsub::WaitResult;
+/// # use embassy_sync::pubsub::PubSubChannel;
 /// # use futures_executor::block_on;
 /// # let test = async {
 /// // Create the channel. This can be static as well
diff --git a/embassy-sync/src/channel/pubsub/publisher.rs b/embassy-sync/src/pubsub/publisher.rs
index 705797f60..705797f60 100644
--- a/embassy-sync/src/channel/pubsub/publisher.rs
+++ b/embassy-sync/src/pubsub/publisher.rs
diff --git a/embassy-sync/src/channel/pubsub/subscriber.rs b/embassy-sync/src/pubsub/subscriber.rs
index b9a2cbe18..b9a2cbe18 100644
--- a/embassy-sync/src/channel/pubsub/subscriber.rs
+++ b/embassy-sync/src/pubsub/subscriber.rs
diff --git a/embassy-sync/src/channel/signal.rs b/embassy-sync/src/signal.rs
index 9279266c1..3f665e388 100644
--- a/embassy-sync/src/channel/signal.rs
+++ b/embassy-sync/src/signal.rs
@@ -19,7 +19,7 @@ use core::task::{Context, Poll, Waker};
 /// Signals are generally declared as `static`s and then borrowed as required.
 ///
 /// ```
-/// use embassy_sync::channel::signal::Signal;
+/// use embassy_sync::signal::Signal;
 ///
 /// enum SomeCommand {
 ///   On,