clippy

Author: burrbull

.github/workflows/clippy.yml

@@ -19,4 +19,4 @@ jobs:
       - uses: actions-rs/clippy-check@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          args: --examples --features=stm32f479,rt,usb_fs,sdio
+          args: --examples --features=stm32f479,rt,usb_fs,sdio-host

src/bb.rs

@@ -39,7 +39,7 @@ pub unsafe fn set<T>(register: *const T, bit: u8) {
 pub unsafe fn write<T>(register: *const T, bit: u8, set: bool) {
     let addr = register as usize;
 
-    assert!(addr >= PERI_ADDRESS_START && addr <= PERI_ADDRESS_END);
+    assert!((PERI_ADDRESS_START..=PERI_ADDRESS_END).contains(&addr));
     assert!(bit < 32);
 
     let bit = bit as usize;

src/dac.rs

@@ -3,7 +3,6 @@
 //! Currently only supports writing to the DR of the DAC,
 //! just a basic one-shot conversion.
 #![deny(unused_imports)]
-use core::mem;
 
 use crate::{
     gpio::{
@@ -28,18 +27,29 @@ pub trait DacPin {
 
 pub trait Pins<DAC> {
     type Output;
+    #[doc(hidden)]
+    fn init() -> Self::Output;
 }
 
 impl Pins<DAC> for PA4<Analog> {
     type Output = C1;
+    fn init() -> Self::Output {
+        C1
+    }
 }
 
 impl Pins<DAC> for PA5<Analog> {
     type Output = C2;
+    fn init() -> Self::Output {
+        C2
+    }
 }
 
 impl Pins<DAC> for (PA4<Analog>, PA5<Analog>) {
     type Output = (C1, C2);
+    fn init() -> Self::Output {
+        (C1, C2)
+    }
 }
 
 pub fn dac<PINS>(_dac: DAC, _pins: PINS) -> PINS::Output
@@ -54,8 +64,7 @@ where
         DAC::enable(rcc);
         DAC::reset(rcc);
 
-        // NOTE(unsafe) ZST, doesn't need initialization.
-        mem::MaybeUninit::uninit().assume_init()
+        PINS::init()
     }
 }
 

src/delay.rs

@@ -18,7 +18,7 @@ impl Delay {
     pub fn new(mut syst: SYST, clocks: Clocks) -> Self {
         syst.set_clock_source(SystClkSource::External);
 
-        Delay { syst, clocks }
+        Delay { clocks, syst }
     }
 
     /// Releases the system timer (SysTick) resource

src/dma/mod.rs

@@ -1449,6 +1449,7 @@ where
         n_transfers
     }
 
+    #[allow(clippy::branches_sharing_code)]
     fn next_transfer_common(
         &mut self,
         new_buf: BUF,
@@ -1528,6 +1529,7 @@ where
     ///
     /// Memory corruption might occur in the previous buffer, the one passed to the closure, if an
     /// overrun occurs in double buffering mode.
+    #[allow(clippy::branches_sharing_code)]
     unsafe fn next_transfer_with_common(
         &mut self,
         new_buf: BUF,
@@ -1570,7 +1572,6 @@ where
                 compiler_fence(Ordering::Acquire);
 
                 self.buf.replace(new_buf);
-                return;
             } else {
                 // "Preceding reads and writes cannot be moved past subsequent writes"
                 compiler_fence(Ordering::Release);
@@ -1585,8 +1586,8 @@ where
                 compiler_fence(Ordering::Acquire);
 
                 self.double_buf.replace(new_buf);
-                return;
             }
+            return;
         }
         let (buf_ptr, buf_len) = ptr_and_len;
         self.stream.set_memory_address(buf_ptr as u32);

src/i2c.rs

@@ -462,7 +462,7 @@ where
         // Calculate settings for I2C speed modes
         let clock = pclk.0;
         let freq = clock / 1_000_000;
-        assert!(freq >= 2 && freq <= 50);
+        assert!((2..=50).contains(&freq));
 
         // Configure bus frequency into I2C peripheral
         self.i2c.cr2.write(|w| unsafe { w.freq().bits(freq as u8) });

src/rcc/mod.rs

@@ -826,7 +826,7 @@ impl CFGR {
             sysclk
         };
 
-        assert!(unchecked || !sysclk_on_pll || sysclk <= SYSCLK_MAX && sysclk >= SYSCLK_MIN);
+        assert!(unchecked || !sysclk_on_pll || (SYSCLK_MIN..=SYSCLK_MAX).contains(&sysclk));
 
         let hclk = self.hclk.unwrap_or(sysclk);
         let (hpre_bits, hpre_div) = match (sysclk + hclk - 1) / hclk {

src/rcc/pll.rs

@@ -58,7 +58,7 @@ impl MainPll {
             .unwrap();
 
         let vco_in = pllsrcclk / pllm;
-        assert!(vco_in >= 1_000_000 && vco_in <= 2_000_000);
+        assert!((1_000_000..=2_000_000).contains(&vco_in));
 
         // Main scaler, must result in >= 100MHz (>= 192MHz for F401)
         // and <= 432MHz, min 50, max 432
@@ -493,7 +493,7 @@ impl SingleOutputPll {
                 let target_vco_out = target * outdiv;
                 let n = (target_vco_out + (vco_in >> 1)) / vco_in;
                 let vco_out = vco_in * n;
-                if vco_out < 100_000_000 || vco_out > 432_000_000 {
+                if !(100_000_000..=432_000_000).contains(&vco_out) {
                     return None;
                 }
                 let output = vco_out / outdiv;

src/rtc.rs

@@ -166,7 +166,7 @@ impl Rtcc for Rtc {
     }
 
     fn set_weekday(&mut self, weekday: u8) -> Result<(), Self::Error> {
-        if (weekday < 1) || (weekday > 7) {
+        if !(1..=7).contains(&weekday) {
             return Err(Error::InvalidInputData);
         }
         self.modify(|regs| regs.dr.modify(|_, w| unsafe { w.wdu().bits(weekday) }));
@@ -175,7 +175,7 @@ impl Rtcc for Rtc {
     }
 
     fn set_day(&mut self, day: u8) -> Result<(), Self::Error> {
-        if (day < 1) || (day > 31) {
+        if !(1..=31).contains(&day) {
             return Err(Error::InvalidInputData);
         }
         let (dt, du) = bcd2_encode(day as u32)?;
@@ -185,7 +185,7 @@ impl Rtcc for Rtc {
     }
 
     fn set_month(&mut self, month: u8) -> Result<(), Self::Error> {
-        if (month < 1) || (month > 12) {
+        if !(1..=12).contains(&month) {
             return Err(Error::InvalidInputData);
         }
         let (mt, mu) = bcd2_encode(month as u32)?;
@@ -195,7 +195,7 @@ impl Rtcc for Rtc {
     }
 
     fn set_year(&mut self, year: u16) -> Result<(), Self::Error> {
-        if (year < 1970) || (year > 2038) {
+        if !(1970..=2038).contains(&year) {
             return Err(Error::InvalidInputData);
         }
         let (yt, yu) = bcd2_encode(year as u32 - 1970)?;

src/serial.rs

@@ -343,6 +343,7 @@ use crate::rcc::Clocks;
 use crate::dma::traits::PeriAddress;
 
 /// Serial error
+#[non_exhaustive]
 #[derive(Debug, Eq, PartialEq, Copy, Clone)]
 pub enum Error {
     /// Framing error
@@ -353,8 +354,6 @@ pub enum Error {
     Overrun,
     /// Parity check error
     Parity,
-    #[doc(hidden)]
-    _Extensible,
 }
 
 /// Interrupt event
@@ -951,15 +950,9 @@ where
                         WordLength::DataBits9 => true,
                     })
                     .pce()
-                    .bit(match config.parity {
-                        Parity::ParityNone => false,
-                        _ => true,
-                    })
+                    .bit(!matches!(config.parity, Parity::ParityNone))
                     .ps()
-                    .bit(match config.parity {
-                        Parity::ParityOdd => true,
-                        _ => false,
-                    })
+                    .bit(matches!(config.parity, Parity::ParityOdd))
             })
         };