clippy

Cargo.toml

@@ -425,4 +425,4 @@ required-features = ["tim8"] # stm32f446
 
 [[example]]
 name = "ist7920_bidi_normal_spi"
-required-features = ["rt", "stm32f401"]
+required-features = ["device-selected"]

examples/analog-stopwatch-with-spi-ssd1306.rs

@@ -168,11 +168,10 @@ fn main() -> ! {
                 led4.set_low();
             }
             StopwatchState::Running => {
+                led4.set_low();
                 if state_led {
-                    led4.set_low();
                     led3.set_high();
                 } else {
-                    led4.set_low();
                     led3.set_low();
                 }
             }
@@ -208,13 +207,12 @@ fn main() -> ! {
 }
 
 fn setup_clocks(rcc: Rcc) -> Clocks {
-    return rcc
-        .cfgr
+    rcc.cfgr
         .hclk(180.mhz())
         .sysclk(180.mhz())
         .pclk1(45.mhz())
         .pclk2(90.mhz())
-        .freeze();
+        .freeze()
 }
 
 #[interrupt]
@@ -291,31 +289,31 @@ fn TIM2() {
     });
 }
 
-fn stopwatch_start<'cs>(cs: &'cs CriticalSection) {
+fn stopwatch_start(cs: &CriticalSection) {
     ELAPSED_MS.borrow(cs).replace(0);
     unsafe {
         pac::NVIC::unmask(hal::pac::Interrupt::TIM2);
     }
 }
 
-fn stopwatch_continue<'cs>(_cs: &'cs CriticalSection) {
+fn stopwatch_continue(_cs: &CriticalSection) {
     unsafe {
         pac::NVIC::unmask(hal::pac::Interrupt::TIM2);
     }
 }
 
-fn stopwatch_stop<'cs>(_cs: &'cs CriticalSection) {
+fn stopwatch_stop(_cs: &CriticalSection) {
     pac::NVIC::mask(hal::pac::Interrupt::TIM2);
 }
 
-fn stopwatch_reset_start<'cs>(cs: &'cs CriticalSection) {
+fn stopwatch_reset_start(cs: &CriticalSection) {
     ELAPSED_RESET_MS.borrow(cs).replace(0);
     unsafe {
         pac::NVIC::unmask(hal::pac::Interrupt::TIM2);
     }
 }
 
-fn stopwatch_reset_stop<'cs>(_cs: &'cs CriticalSection) {
+fn stopwatch_reset_stop(_cs: &CriticalSection) {
     pac::NVIC::mask(hal::pac::Interrupt::TIM2);
 }
 
@@ -332,15 +330,15 @@ fn format_elapsed(buf: &mut ArrayString<[u8; 10]>, elapsed: u32) {
 }
 
 fn elapsed_to_ms(elapsed: u32) -> u32 {
-    return elapsed % 1000;
+    elapsed % 1000
 }
 
 fn elapsed_to_s(elapsed: u32) -> u32 {
-    return (elapsed - elapsed_to_ms(elapsed)) % 60000 / 1000;
+    (elapsed - elapsed_to_ms(elapsed)) % 60000 / 1000
 }
 
 fn elapsed_to_m(elapsed: u32) -> u32 {
-    return elapsed / 60000;
+    elapsed / 60000
 }
 
 /// Convert a polar coordinate (angle/distance) into an (X, Y) coordinate centered around `CENTER`

examples/blinky-timer-irq.rs

@@ -30,10 +30,10 @@ use embedded_hal::timer::CountDown;
 
 // A type definition for the GPIO pin to be used for our LED
 // For the onboard nucleo LED, use gpioa::PA5 or gpiob::PB13 depending your model
-type LEDPIN = gpioa::PA5<Output<PushPull>>;
+type LedPin = gpioa::PA5<Output<PushPull>>;
 
 // Make LED pin globally available
-static G_LED: Mutex<RefCell<Option<LEDPIN>>> = Mutex::new(RefCell::new(None));
+static G_LED: Mutex<RefCell<Option<LedPin>>> = Mutex::new(RefCell::new(None));
 
 // Make timer interrupt registers globally available
 static G_TIM: Mutex<RefCell<Option<CountDownTimer<TIM2>>>> = Mutex::new(RefCell::new(None));
@@ -42,7 +42,7 @@ static G_TIM: Mutex<RefCell<Option<CountDownTimer<TIM2>>>> = Mutex::new(RefCell:
 // This specific interrupt will "trip" when the timer TIM2 times out
 #[interrupt]
 fn TIM2() {
-    static mut LED: Option<LEDPIN> = None;
+    static mut LED: Option<LedPin> = None;
     static mut TIM: Option<CountDownTimer<TIM2>> = None;
 
     let led = LED.get_or_insert_with(|| {

examples/delay-syst-blinky.rs

@@ -1,13 +1,13 @@
 //! Demonstrate the use of a blocking `Delay` using the SYST (sysclock) timer.
 
 #![deny(unsafe_code)]
+#![allow(clippy::empty_loop)]
 #![no_main]
 #![no_std]
 
 // Halt on panic
 use panic_halt as _; // panic handler
 
-use cortex_m;
 use cortex_m_rt::entry;
 use stm32f4xx_hal as hal;
 

examples/delay-timer-blinky.rs

@@ -1,13 +1,13 @@
 //! Demonstrate the use of a blocking `Delay` using TIM5 general-purpose timer.
 
 #![deny(unsafe_code)]
+#![allow(clippy::empty_loop)]
 #![no_main]
 #![no_std]
 
 // Halt on panic
 use panic_halt as _; // panic handler
 
-use cortex_m;
 use cortex_m_rt::entry;
 use stm32f4xx_hal as hal;
 

examples/dwt-blinky.rs

@@ -1,3 +1,4 @@
+#![allow(clippy::empty_loop)]
 #![deny(unsafe_code)]
 #![no_main]
 #![no_std]
@@ -8,7 +9,6 @@ use crate::hal::{
     pac,
     prelude::*,
 };
-use cortex_m;
 use cortex_m_rt::entry;
 use panic_halt as _;
 use stm32f4xx_hal as hal;

examples/pwm-input.rs

@@ -5,7 +5,6 @@
 // Halt on panic
 use panic_halt as _;
 
-use cortex_m;
 use cortex_m_rt::entry;
 use stm32f4xx_hal::{pac, prelude::*, timer::Timer};
 

examples/qei.rs

@@ -12,7 +12,6 @@
 // Halt on panic
 use panic_halt as _;
 
-use cortex_m;
 use cortex_m_rt::entry;
 use embedded_hal::Direction as RotaryDirection;
 use stm32f4xx_hal::{delay::Delay, pac, prelude::*, qei::Qei};

examples/rng-display.rs

@@ -10,6 +10,7 @@
 //! Note that this example requires the `--release` build flag because it is too
 //! large to fit in the default `memory.x` file provided with this crate.
 
+#![allow(clippy::empty_loop)]
 #![no_std]
 #![no_main]
 

examples/ssd1306-image.rs

@@ -9,6 +9,7 @@
 //!
 //! Note that `--release` is required to fix link errors for smaller devices.
 
+#![allow(clippy::empty_loop)]
 #![no_std]
 #![no_main]
 
@@ -87,15 +88,15 @@ fn main() -> ! {
 /// Helper function - what rotation flips the screen upside down from
 /// the rotation we're in now?
 fn get_next_rotation(rotation: DisplayRotation) -> DisplayRotation {
-    return match rotation {
+    match rotation {
         DisplayRotation::Rotate0 => DisplayRotation::Rotate180,
         DisplayRotation::Rotate180 => DisplayRotation::Rotate0,
 
         // Default branch - if for some reason we end up in one of the portrait modes,
         // reset to 0 degrees landscape. On most SSD1306 displays, this means down is towards
         // the flat flex coming out of the display (and up is towards the breakout board pins).
         _ => DisplayRotation::Rotate0,
-    };
+    }
 }
 
 #[exception]

examples/stopwatch-with-ssd1306-and-interrupts.rs

@@ -14,6 +14,7 @@
 //!
 //! Video of this example running: https://imgur.com/a/lQTQFLy
 
+#![allow(clippy::empty_loop)]
 #![no_std]
 #![no_main]
 
@@ -188,23 +189,22 @@ fn EXTI15_10() {
 }
 
 fn setup_clocks(rcc: Rcc) -> Clocks {
-    return rcc
-        .cfgr
+    rcc.cfgr
         .hclk(48.mhz())
         .sysclk(48.mhz())
         .pclk1(24.mhz())
         .pclk2(24.mhz())
-        .freeze();
+        .freeze()
 }
 
-fn stopwatch_start<'cs>(cs: &'cs CriticalSection) {
+fn stopwatch_start(cs: &CriticalSection) {
     ELAPSED_MS.borrow(cs).replace(0);
     unsafe {
         pac::NVIC::unmask(hal::pac::Interrupt::TIM2);
     }
 }
 
-fn stopwatch_stop<'cs>(_cs: &'cs CriticalSection) {
+fn stopwatch_stop(_cs: &CriticalSection) {
     pac::NVIC::mask(hal::pac::Interrupt::TIM2);
 }
 
@@ -221,13 +221,13 @@ fn format_elapsed(buf: &mut ArrayString<[u8; 10]>, elapsed: u32) {
 }
 
 fn elapsed_to_ms(elapsed: u32) -> u32 {
-    return elapsed % 1000;
+    elapsed % 1000
 }
 
 fn elapsed_to_s(elapsed: u32) -> u32 {
-    return (elapsed - elapsed_to_ms(elapsed)) % 60000 / 1000;
+    (elapsed - elapsed_to_ms(elapsed)) % 60000 / 1000
 }
 
 fn elapsed_to_m(elapsed: u32) -> u32 {
-    return elapsed / 60000;
+    elapsed / 60000
 }

src/spi.rs

@@ -681,7 +681,8 @@ where
             });
             Error::Crc.into()
         } else if sr.txe().bit_is_set() {
-            return Ok(self.send_u8(byte));
+            self.send_u8(byte);
+            return Ok(());
         } else {
             nb::Error::WouldBlock
         })