clock/v2: Fix Rust 2021 incompatible prefixed identifies

atsamd-rs · Nov 2, 2021 · 447f5db · 447f5db
1 parent d2bf8a3
commit 447f5db
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/hal/src/thumbv7em/clock/v2/gclk.rs b/hal/src/thumbv7em/clock/v2/gclk.rs
@@ -291,19 +291,19 @@ pub mod marker {
     impl_gclk1_source!(Gclk0);
 
     seq!(N in 2..=11 {
-        impl_gclk1_source!(Gclk#N);
+        impl_gclk1_source!(Gclk #N);
     });
 
     seq!(N in 2..=11 {
         /// Type which serves as a source marker for the corresponding
         /// [`super::Gclk`] and provides numerical identity for it
         ///
         /// Standard division factor, see [`GclkDiv`]
-        pub enum Gclk#N {}
-        impl Sealed for Gclk#N {}
-        impl NotGclk0 for Gclk#N {}
-        impl NotGclk1 for Gclk#N {}
-        impl GclkNum for Gclk#N {
+        pub enum Gclk #N {}
+        impl Sealed for Gclk #N {}
+        impl NotGclk0 for Gclk #N {}
+        impl NotGclk1 for Gclk #N {}
+        impl GclkNum for Gclk #N {
             const NUM: usize = N;
             type DividerType = GclkDiv;
         }
@@ -716,7 +716,7 @@ impl<T: GclkSourceMarker> Enabled<Gclk0<T>, U1> {
 
 seq!(G in 0..=11 {
     /// Alias of [`Gclk`]`<marker::GclkX, _>`
-    pub type Gclk#G<S> = Gclk<marker::Gclk#G, S>;
+    pub type Gclk #G<S> = Gclk<marker::Gclk #G, S>;
 });
 
 //==============================================================================
@@ -727,7 +727,7 @@ seq!(N in 1..=11 {
     /// [`Gclk`] tokens ensuring there only exists one instance of each [`Gclk`]
     pub struct Tokens {
         #( /// GclkToken for Gclk#N
-           pub gclk#N: GclkToken<marker::Gclk#N>, )*
+           pub gclk #N: GclkToken<marker::Gclk #N>, )*
     }
 
     impl Tokens {
@@ -738,7 +738,7 @@ seq!(N in 1..=11 {
             // Return all tokens when initially created
             unsafe {
                 Tokens {
-                    #( gclk#N: GclkToken::new(), )*
+                    #( gclk #N: GclkToken::new(), )*
                 }
             }
         }

diff --git a/hal/src/thumbv7em/clock/v2/gclkio.rs b/hal/src/thumbv7em/clock/v2/gclkio.rs
@@ -386,18 +386,18 @@ seq!(N in 0..=11 {
     /// Tokens for every [`GclkIn`] and [`GclkOut`]
     pub struct Tokens {
         #( /// GclkIn #N
-           pub gclk_in#N: GclkInToken<marker::Gclk#N>, )*
+           pub gclk_in #N: GclkInToken<marker::Gclk #N>, )*
         #( /// GclkOut #N
-           pub gclk_out#N: GclkOutToken<marker::Gclk#N>, )*
+           pub gclk_out #N: GclkOutToken<marker::Gclk #N>, )*
     }
 
     impl Tokens {
         // Populate the Tokens struct and return it
         #[inline]
         pub(super) unsafe fn new() -> Tokens {
             Tokens {
-                #( gclk_in#N: GclkInToken::new(), )*
-                #( gclk_out#N: GclkOutToken::new(), )*
+                #( gclk_in #N: GclkInToken::new(), )*
+                #( gclk_out #N: GclkOutToken::new(), )*
             }
         }
     }

diff --git a/hal/src/thumbv7em/clock/v2/pclk.rs b/hal/src/thumbv7em/clock/v2/pclk.rs
@@ -135,8 +135,8 @@ pub trait PclkSourceMarker: GclkNum + SourceMarker {
 }
 
 seq!(N in 0..=11 {
-    impl PclkSourceMarker for marker::Gclk#N {
-        const PCLK_SRC: PclkSourceEnum = PclkSourceEnum::GCLK#N;
+    impl PclkSourceMarker for marker::Gclk #N {
+        const PCLK_SRC: PclkSourceEnum = PclkSourceEnum::GCLK #N;
     }
 });