Replace Slave with paste [<$I2c Slave>]

Rahix · Oct 27, 2020 · 0b4b50a · 0b4b50a
1 parent d093d42
commit 0b4b50a
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/avr-hal-generic/src/i2c.rs b/avr-hal-generic/src/i2c.rs
@@ -201,7 +201,7 @@ macro_rules! impl_twi_i2c {
                 data: $twdr:ident,
             },
         }
-    ) => {
+    ) => {$crate::paste::paste! {
         $(#[$i2c_attr])*
         pub struct $I2c<CLOCK: $crate::clock::Clock, M> {
             p: $I2C,
@@ -501,15 +501,15 @@ macro_rules! impl_twi_i2c {
         }
 
         $(#[$i2c_attr])*
-        pub struct Slave<CLOCK: $crate::clock::Clock, M> {
+        pub struct [<$I2c Slave>]<CLOCK: $crate::clock::Clock, M> {
             p: $I2C,
             _clock: ::core::marker::PhantomData<CLOCK>,
             sda: $sdamod::$SDA<M>,
             scl: $sclmod::$SCL<M>,
             address: u8,
         }
 
-        impl<CLOCK> Slave<CLOCK, $crate::i2c::I2cPullUp>
+        impl<CLOCK> [<$I2c Slave>]<CLOCK, $crate::i2c::I2cPullUp>
         where
             CLOCK: $crate::clock::Clock,
         {
@@ -526,14 +526,14 @@ macro_rules! impl_twi_i2c {
                 scl: $sclmod::$SCL<$crate::port::mode::Input<$crate::port::mode::PullUp>>,
                 speed: u32,
                 address: u8,
-            ) -> Slave<CLOCK, $crate::i2c::I2cPullUp> {
+            ) -> [<$I2c Slave>]<CLOCK, $crate::i2c::I2cPullUp> {
                 // Calculate TWBR
                 let twbr = ((CLOCK::FREQ / speed) - 16) / 2;
                 p.$twbr.write(|w| unsafe { w.bits(twbr as u8) });
                 // Disable prescaler
                 p.$twsr.write(|w| w.$twps().prescaler_1());
 
-                Slave {
+                [<$I2c Slave>] {
                     p,
                     sda,
                     scl,
@@ -543,7 +543,7 @@ macro_rules! impl_twi_i2c {
             }
         }
 
-        impl<CLOCK> Slave<CLOCK, $crate::i2c::I2cFloating>
+        impl<CLOCK> [<$I2c Slave>]<CLOCK, $crate::i2c::I2cFloating>
         where
             CLOCK: $crate::clock::Clock,
         {
@@ -560,14 +560,14 @@ macro_rules! impl_twi_i2c {
                 scl: $sclmod::$SCL<$crate::port::mode::Input<$crate::port::mode::Floating>>,
                 speed: u32,
                 address: u8,
-            ) -> Slave<CLOCK, $crate::i2c::I2cFloating> {
+            ) -> [<$I2c Slave>]<CLOCK, $crate::i2c::I2cFloating> {
                 // Calculate TWBR
                 let twbr = ((CLOCK::FREQ / speed) - 16) / 2;
                 p.$twbr.write(|w| unsafe { w.bits(twbr as u8) });
                 // Disable prescaler
                 p.$twsr.write(|w| w.$twps().prescaler_1());
 
-                Slave {
+                [<$I2c Slave>] {
                     p,
                     sda,
                     scl,
@@ -576,5 +576,5 @@ macro_rules! impl_twi_i2c {
                 }
             }
         }
-    };
+    }};
 }