clippy

Author: burrbull

src/adc.rs

@@ -532,16 +532,15 @@ impl<ADC: Instance> Adc<ADC> {
 
         //Set the sample time for the channel
         let st = sample_time as u8;
-        let ch = channel as u8;
         match channel {
             0..=9 => self
                 .adc_reg
                 .smpr2()
-                .modify(|_, w| unsafe { w.smp(ch).bits(st) }),
+                .modify(|_, w| unsafe { w.smp(channel).bits(st) }),
             10..=18 => self
                 .adc_reg
                 .smpr1()
-                .modify(|_, w| unsafe { w.smp(ch - 10).bits(st) }),
+                .modify(|_, w| unsafe { w.smp(channel - 10).bits(st) }),
             _ => unimplemented!(),
         };
     }

src/fmpi2c.rs

@@ -198,7 +198,7 @@ fn calculate_timing(
     let mut presc: u8;
     // if ratio is > (scll+sclh)*presc. that frequancy is not possible to generate. so
     // minimum frequancy possible is generated
-    if product > 8192 as f32 {
+    if product > 8192_f32 {
         // TODO: should we panic or use minimum allowed frequancy
         scl_l = 0x7fu8;
         scl_h = 0x7fu8;
@@ -214,7 +214,7 @@ fn calculate_timing(
             let deviation = product % tmp_presc as f32;
             if min_deviation > deviation {
                 min_deviation = deviation;
-                presc = tmp_presc as u8;
+                presc = tmp_presc;
             }
         }
         // now that we have optimal prescalar value. optimal scl_l and scl_h

src/rcc/f4/enable.rs

@@ -20,7 +20,7 @@ macro_rules! bus_enable {
             }
             #[inline(always)]
             fn is_enabled() -> bool {
-                let rcc = pac::RCC::ptr();
+                let rcc = RCC::ptr();
                 (Self::Bus::enr(unsafe { &*rcc }).read().bits() >> $bit) & 0x1 != 0
             }
         }
@@ -45,7 +45,7 @@ macro_rules! bus_lpenable {
             }
             #[inline(always)]
             fn is_enabled_in_low_power() -> bool {
-                let rcc = pac::RCC::ptr();
+                let rcc = RCC::ptr();
                 (Self::Bus::lpenr(unsafe { &*rcc }).read().bits() >> $bit) & 0x1 != 0
             }
         }
@@ -56,9 +56,10 @@ macro_rules! bus_reset {
         impl Reset for crate::pac::$PER {
             #[inline(always)]
             fn reset(rcc: &mut RCC) {
+                let rstr = Self::Bus::rstr(rcc);
                 unsafe {
-                    bb::set(Self::Bus::rstr(rcc), $bit);
-                    bb::clear(Self::Bus::rstr(rcc), $bit);
+                    bb::set(rstr, $bit);
+                    bb::clear(rstr, $bit);
                 }
             }
         }

src/rcc/f4/mod.rs

@@ -1,4 +1,5 @@
 use crate::pac::rcc::cfgr::{HPRE, SW};
+use crate::pac::rcc::RegisterBlock as RccRB;
 use crate::pac::{self, rcc, RCC};
 
 use super::{BusClock, BusTimerClock, RccBus};
@@ -9,10 +10,8 @@ use fugit::RateExtU32;
 mod pll;
 
 mod enable;
-use crate::pac::rcc::RegisterBlock as RccRB;
 
 /// Enable/disable peripheral
-#[allow(clippy::missing_safety_doc)]
 pub trait Enable: RccBus {
     /// Enables peripheral
     fn enable(rcc: &mut RCC);
@@ -33,21 +32,20 @@ pub trait Enable: RccBus {
     ///
     /// Enables peripheral. Takes access to RCC internally
     unsafe fn enable_unchecked() {
-        let mut rcc = pac::RCC::steal();
+        let mut rcc = RCC::steal();
         Self::enable(&mut rcc);
     }
 
     /// # Safety
     ///
     /// Disables peripheral. Takes access to RCC internally
     unsafe fn disable_unchecked() {
-        let mut rcc = pac::RCC::steal();
+        let mut rcc = RCC::steal();
         Self::disable(&mut rcc);
     }
 }
 
 /// Low power enable/disable peripheral
-#[allow(clippy::missing_safety_doc)]
 pub trait LPEnable: RccBus {
     /// Enables peripheral in low power mode
     fn enable_in_low_power(rcc: &mut RCC);
@@ -68,21 +66,20 @@ pub trait LPEnable: RccBus {
     ///
     /// Enables peripheral in low power mode. Takes access to RCC internally
     unsafe fn enable_in_low_power_unchecked() {
-        let mut rcc = pac::RCC::steal();
+        let mut rcc = RCC::steal();
         Self::enable_in_low_power(&mut rcc);
     }
 
     /// # Safety
     ///
     /// Disables peripheral in low power mode. Takes access to RCC internally
     unsafe fn disable_in_low_power_unchecked() {
-        let mut rcc = pac::RCC::steal();
+        let mut rcc = RCC::steal();
         Self::disable_in_low_power(&mut rcc);
     }
 }
 
 /// Reset peripheral
-#[allow(clippy::missing_safety_doc)]
 pub trait Reset: RccBus {
     /// Resets peripheral
     fn reset(rcc: &mut RCC);
@@ -91,7 +88,7 @@ pub trait Reset: RccBus {
     ///
     /// Resets peripheral. Takes access to RCC internally
     unsafe fn reset_unchecked() {
-        let mut rcc = pac::RCC::steal();
+        let mut rcc = RCC::steal();
         Self::reset(&mut rcc);
     }
 }
@@ -103,14 +100,12 @@ pub trait RccExt {
 }
 
 macro_rules! bus_struct {
-    ($( $(#[$attr:meta])* $busX:ident => ($EN:ident, $en:ident, $LPEN:ident, $lpen:ident, $RST:ident, $rst:ident, $doc:literal),)+) => {
+    ($($busX:ident => ($EN:ident, $en:ident, $LPEN:ident, $lpen:ident, $RST:ident, $rst:ident, $doc:literal),)+) => {
         $(
-            $(#[$attr])*
             #[doc = $doc]
             #[non_exhaustive]
             pub struct $busX;
 
-            $(#[$attr])*
             impl $busX {
                 pub(crate) fn enr(rcc: &RccRB) -> &rcc::$EN {
                     rcc.$en()
@@ -132,11 +127,13 @@ bus_struct! {
     APB1 => (APB1ENR, apb1enr, APB1LPENR, apb1lpenr, APB1RSTR, apb1rstr, "Advanced Peripheral Bus 1 (APB1) registers"),
     APB2 => (APB2ENR, apb2enr, APB2LPENR, apb2lpenr, APB2RSTR, apb2rstr, "Advanced Peripheral Bus 2 (APB2) registers"),
     AHB1 => (AHB1ENR, ahb1enr, AHB1LPENR, ahb1lpenr, AHB1RSTR, ahb1rstr, "Advanced High-performance Bus 1 (AHB1) registers"),
-    #[cfg(not(feature = "gpio-f410"))]
-    AHB2 => (AHB2ENR, ahb2enr, AHB2LPENR, ahb2lpenr, AHB2RSTR, ahb2rstr, "Advanced High-performance Bus 2 (AHB2) registers"),
     //#[cfg(any(feature = "fsmc", feature = "fmc"))]
     //AHB3 => (AHB3ENR, ahb3enr, AHB3LPENR, ahb3lpenr, AHB3RSTR, ahb3rstr, "Advanced High-performance Bus 3 (AHB3) registers"),
 }
+#[cfg(not(feature = "gpio-f410"))]
+bus_struct! {
+    AHB2 => (AHB2ENR, ahb2enr, AHB2LPENR, ahb2lpenr, AHB2RSTR, ahb2rstr, "Advanced High-performance Bus 2 (AHB2) registers"),
+}
 
 /// AMBA High-performance Bus 3 (AHB3) registers
 #[cfg(any(feature = "fsmc", feature = "fmc"))]