From db9ea57b82ecc2d441fa4cae61ed08c65688c0aa Mon Sep 17 00:00:00 2001
From: ROMemories <152802150+ROMemories@users.noreply.github.com>
Date: Fri, 20 Sep 2024 13:16:57 +0200
Subject: [PATCH] refactor(embassy-common): move crate re-exports to a
 dedicated module

---
 src/riot-rs-embassy-common/src/i2c/controller/mod.rs | 10 +++++-----
 src/riot-rs-embassy-common/src/lib.rs                | 11 +++++++----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/riot-rs-embassy-common/src/i2c/controller/mod.rs b/src/riot-rs-embassy-common/src/i2c/controller/mod.rs
index 1f2052b54..a200db8f1 100644
--- a/src/riot-rs-embassy-common/src/i2c/controller/mod.rs
+++ b/src/riot-rs-embassy-common/src/i2c/controller/mod.rs
@@ -114,7 +114,7 @@ impl From<NoAcknowledgeSource> for embedded_hal::i2c::NoAcknowledgeSource {
 #[macro_export]
 macro_rules! impl_async_i2c_for_driver_enum {
     ($driver_enum:ident, $( $peripheral:ident ),*) => {
-        impl embedded_hal_async::i2c::I2c for $driver_enum {
+        impl $crate::reexports::embedded_hal_async::i2c::I2c for $driver_enum {
             async fn read(&mut self, address: u8, read: &mut [u8]) -> Result<(), Self::Error> {
                 match self {
                     $(
@@ -171,13 +171,13 @@ macro_rules! impl_async_i2c_for_driver_enum {
 #[macro_export]
 macro_rules! handle_i2c_timeout_res {
     ($i2c:ident, $op:ident, $address:ident, $( $param:ident ),+) => {{
-        let res = $crate::embassy_futures::select::select(
+        let res = $crate::reexports::embassy_futures::select::select(
             // Disambiguate between the trait methods and the direct methods.
-            $crate::embedded_hal_async::i2c::I2c::$op(&mut $i2c.twim, $address, $( $param ),+),
-            $crate::embassy_time::Timer::after($crate::i2c::controller::I2C_TIMEOUT),
+            $crate::reexports::embedded_hal_async::i2c::I2c::$op(&mut $i2c.twim, $address, $( $param ),+),
+            $crate::reexports::embassy_time::Timer::after($crate::i2c::controller::I2C_TIMEOUT),
         ).await;
 
-        if let $crate::embassy_futures::select::Either::First(op) = res {
+        if let $crate::reexports::embassy_futures::select::Either::First(op) = res {
             // `from_error` is defined in each arch
             op.map_err(from_error)
         } else {
diff --git a/src/riot-rs-embassy-common/src/lib.rs b/src/riot-rs-embassy-common/src/lib.rs
index 40781d2fa..41002b5f4 100644
--- a/src/riot-rs-embassy-common/src/lib.rs
+++ b/src/riot-rs-embassy-common/src/lib.rs
@@ -13,8 +13,11 @@ pub mod executor_swi;
 #[cfg(feature = "i2c")]
 pub mod i2c;
 
-// Used by macros provided by this crate.
-pub use embassy_futures;
-pub use embassy_time;
+pub mod reexports {
+    //! Crate re-exports.
 
-pub use embedded_hal_async;
+    // Used by macros provided by this crate.
+    pub use embassy_futures;
+    pub use embassy_time;
+    pub use embedded_hal_async;
+}