Merge pull request #227 from Piroro-hs/untypenum

Make use of const generics (take 2)

Author: Sh3Rm4n

.clippy.toml

@@ -1 +1 @@
-msrv = "1.50"
+msrv = "1.51"

.github/workflows/ci.yml

@@ -61,7 +61,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.50.0
+          toolchain: 1.51.0
           target: thumbv7em-none-eabihf
           override: true
           profile: minimal

CHANGELOG.md

@@ -31,7 +31,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Breaking Changes
 
-- The MSVR was bumped to 1.50 ([#220])
+- The MSVR was bumped to 1.51 ([#227])
 - Replace custom time based units with types defined in the [embedded-time][]
   crate ([#192])
 - The `rcc` public API now expects time based units in `Megahertz`.
@@ -320,6 +320,7 @@ let clocks = rcc
 [defmt]: https://github.com/knurling-rs/defmt
 [filter]: https://defmt.ferrous-systems.com/filtering.html
 
+[#227]: https://github.com/stm32-rs/stm32f3xx-hal/pull/227
 [#220]: https://github.com/stm32-rs/stm32f3xx-hal/pull/220
 [#217]: https://github.com/stm32-rs/stm32f3xx-hal/pull/217
 [#216]: https://github.com/stm32-rs/stm32f3xx-hal/pull/216

Cargo.toml

@@ -35,7 +35,6 @@ nb = "1"
 paste = "1"
 rtcc = "0.2"
 stm32f3 = "0.13"
-typenum = "1"
 
 [dependencies.embedded-hal-can]
 version = "0.1.0"

README.md

@@ -154,7 +154,7 @@ See the [examples folder](examples) for more example programs.
 
 ## Minimum Supported Rust Version (MSRV)
 
-This crate is guaranteed to compile on stable Rust 1.50.0 and up. It *might*
+This crate is guaranteed to compile on stable Rust 1.51.0 and up. It *might*
 compile with older versions but that may change in any new patch release.
 
 <!-- This should not prevent anyone to use newer features. -->

src/gpio.rs

@@ -72,8 +72,6 @@ use crate::{
 #[cfg(feature = "unproven")]
 use crate::hal::digital::v2::{toggleable, InputPin, StatefulOutputPin};
 
-use typenum::{Unsigned, U0, U1, U10, U11, U12, U13, U14, U15, U2, U3, U4, U5, U6, U7, U8, U9};
-
 /// Extension trait to split a GPIO peripheral in independent pins and registers
 pub trait GpioExt {
     /// The Parts to split the GPIO peripheral into
@@ -208,13 +206,13 @@ impl marker::Index for Ux {
     }
 }
 
-impl<U> marker::Index for U
-where
-    U: Unsigned,
-{
+/// Compile time defined pin number (type state)
+pub struct U<const X: u8>;
+
+impl<const X: u8> marker::Index for U<X> {
     #[inline(always)]
     fn index(&self) -> u8 {
-        Self::U8
+        X
     }
 }
 
@@ -223,7 +221,7 @@ pub struct Input;
 /// Output mode (type state)
 pub struct Output<Otype>(PhantomData<Otype>);
 /// Alternate function (type state)
-pub struct Alternate<Af, Otype>(PhantomData<Af>, PhantomData<Otype>);
+pub struct Alternate<Otype, const AF: u8>(PhantomData<Otype>);
 /// Analog mode (type state)
 pub struct Analog;
 
@@ -235,10 +233,10 @@ pub struct OpenDrain;
 impl marker::Readable for Input {}
 impl marker::Readable for Output<OpenDrain> {}
 impl<Otype> marker::OutputSpeed for Output<Otype> {}
-impl<Af, Otype> marker::OutputSpeed for Alternate<Af, Otype> {}
+impl<Otype, const AF: u8> marker::OutputSpeed for Alternate<Otype, AF> {}
 impl marker::Active for Input {}
 impl<Otype> marker::Active for Output<Otype> {}
-impl<Af, Otype> marker::Active for Alternate<Af, Otype> {}
+impl<Otype, const AF: u8> marker::Active for Alternate<Otype, AF> {}
 
 /// Slew rate configuration
 pub enum Speed {
@@ -299,18 +297,15 @@ macro_rules! modify_at {
     };
 }
 
-impl<Gpio, Index, Mode> Pin<Gpio, Index, Mode>
-where
-    Index: Unsigned,
-{
+impl<Gpio, Mode, const X: u8> Pin<Gpio, U<X>, Mode> {
     /// Erases the pin number from the type
     ///
     /// This is useful when you want to collect the pins into an array where you
     /// need all the elements to have the same type
     pub fn downgrade(self) -> Pin<Gpio, Ux, Mode> {
         Pin {
             gpio: self.gpio,
-            index: Ux(Index::U8),
+            index: Ux(X),
             _mode: self._mode,
         }
     }
@@ -633,10 +628,10 @@ where
 }
 
 macro_rules! af {
-    ($i:literal, $Ui:ty, $AFi:ident, $IntoAfi:ident, $into_afi_push_pull:ident, $into_afi_open_drain:ident) => {
+    ($i:literal, $AFi:ident, $IntoAfi:ident, $into_afi_push_pull:ident, $into_afi_open_drain:ident) => {
         paste::paste! {
             #[doc = "Alternate function " $i " (type state)"]
-            pub type $AFi<Otype> = Alternate<$Ui, Otype>;
+            pub type $AFi<Otype> = Alternate<Otype, $i>;
         }
 
         impl<Gpio, Index, Mode> Pin<Gpio, Index, Mode>
@@ -676,7 +671,7 @@ macro_rules! af {
     ([$($i:literal),+ $(,)?]) => {
         paste::paste! {
             $(
-                af!($i, [<U $i>], [<AF $i>], [<IntoAf $i>],  [<into_af $i _push_pull>],  [<into_af $i _open_drain>]);
+                af!($i, [<AF $i>], [<IntoAf $i>],  [<into_af $i _push_pull>],  [<into_af $i _open_drain>]);
             )+
         }
     };
@@ -746,11 +741,11 @@ macro_rules! gpio {
         iopen: $iopxen:ident,
         ioprst: $iopxrst:ident,
         partially_erased_pin: $PXx:ty,
-        pins: {$(
-            $PXi:ty: (
-                $pxi:ident, $Ui:ty, $MODE:ty, $AFR:ident, [$($IntoAfi:ident),*],
+        pins: [$(
+            $i:literal => (
+                $PXi:ty, $pxi:ident, $MODE:ty, $AFR:ident, [$($IntoAfi:ident),*],
             ),
-        )+},
+        )+],
     }) => {
         paste::paste!{
             #[doc = "GPIO port " $GPIOX " (type state)"]
@@ -790,19 +785,14 @@ macro_rules! gpio {
                     rcc::AHB,
                 };
 
-                use super::{marker, Afr, $Gpiox, GpioExt, Moder, Ospeedr, Otyper, Pin, Pupdr, Ux};
+                use super::{marker, Afr, $Gpiox, GpioExt, Moder, Ospeedr, Otyper, Pin, Pupdr, U, Ux};
 
                 #[allow(unused_imports)]
                 use super::{
                     Input, Output, Analog, PushPull, OpenDrain,
                     AF0, AF1, AF2, AF3, AF4, AF5, AF6, AF7, AF8, AF9, AF10, AF11, AF12, AF13, AF14, AF15,
                 };
 
-                #[allow(unused_imports)]
-                use typenum::{
-                    U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14, U15
-                };
-
                 /// GPIO parts
                 pub struct Parts {
                     /// Opaque AFRH register
@@ -841,7 +831,7 @@ macro_rules! gpio {
                             $(
                                 $pxi: $PXi {
                                     gpio: $Gpiox,
-                                    index: $Ui::new(),
+                                    index: U::<$i>,
                                     _mode: PhantomData,
                                 },
                             )+
@@ -924,7 +914,7 @@ macro_rules! gpio {
 
                 $(
                     #[doc = "Pin " $PXi]
-                    pub type $PXi<Mode> = Pin<$Gpiox, $Ui, Mode>;
+                    pub type $PXi<Mode> = Pin<$Gpiox, U<$i>, Mode>;
 
                     $(
                         impl<Mode> marker::$IntoAfi for $PXi<Mode> {
@@ -963,11 +953,11 @@ macro_rules! gpio {
                     iopen: [<iop $x en>],
                     ioprst: [<iop $x rst>],
                     partially_erased_pin: [<P $X x>],
-                    pins: {$(
-                        [<P $X $i>]: (
-                            [<p $x $i>], [<U $i>], $MODE, [<AFR $LH>], [$([<IntoAf $af>]),*],
+                    pins: [$(
+                        $i => (
+                            [<P $X $i>], [<p $x $i>], $MODE, [<AFR $LH>], [$([<IntoAf $af>]),*],
                         ),
-                    )+},
+                    )+],
                 });
             )+
         }