Merge #389

389: fix deprecation & clippy warnings r=therealprof a=burrbull



Co-authored-by: Andrey Zgarbul <zgarbul.andrey@gmail.com>

Cargo.toml

@@ -16,7 +16,7 @@ features = ["stm32f103", "rt"]
 default-target = "x86_64-unknown-linux-gnu"
 
 [dependencies]
-cortex-m = "0.7"
+cortex-m = "0.7.4"
 cortex-m-rt = "0.7"
 nb = "1"
 stm32f1 = "0.14.0"

examples/adc-dma-circ.rs

@@ -1,5 +1,6 @@
 //! ADC interface circular DMA RX transfer test
 
+#![allow(clippy::empty_loop)]
 #![no_main]
 #![no_std]
 

examples/adc-dma-rx.rs

@@ -1,5 +1,6 @@
 //! ADC interface DMA RX transfer test
 
+#![allow(clippy::empty_loop)]
 #![no_main]
 #![no_std]
 

examples/blinky_rtcalarm_irq.rs

@@ -7,6 +7,8 @@
 //! GPIOs PC13 to PC15 in output mode is restricted: the speed has to be limited to 2MHz with
 //! a maximum load of 30pF and these IOs must not be used as a current source (e.g. to drive a LED)"
 
+#![allow(clippy::empty_loop)]
+#![allow(unused)]
 #![no_std]
 #![no_main]
 
@@ -26,10 +28,10 @@ use cortex_m::{asm::wfi, interrupt::Mutex};
 use cortex_m_rt::entry;
 
 // A type definition for the GPIO pin to be used for our LED
-type LEDPIN = gpioc::PC13<Output<PushPull>>;
+type LedPin = gpioc::PC13<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 RTC globally available
 static G_RTC: Mutex<RefCell<Option<Rtc>>> = Mutex::new(RefCell::new(None));
 // Make EXTI registers globally available
@@ -50,7 +52,7 @@ fn main() -> ! {
 #[cfg(not(feature = "stm32f101"))]
 #[interrupt]
 fn RTCALARM() {
-    static mut LED: Option<LEDPIN> = None;
+    static mut LED: Option<LedPin> = None;
     static mut RTC: Option<Rtc> = None;
     static mut EXTI: Option<EXTI> = None;
 

examples/blinky_timer_irq.rs

@@ -32,10 +32,10 @@ use cortex_m_rt::entry;
 //use cortex_m_semihosting::hprintln;
 
 // A type definition for the GPIO pin to be used for our LED
-type LEDPIN = gpioc::PC13<Output<PushPull>>;
+type LedPin = gpioc::PC13<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));
@@ -44,7 +44,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/crc.rs

@@ -1,6 +1,7 @@
 //! CRC calculation
 
 #![deny(unsafe_code)]
+#![allow(clippy::empty_loop)]
 #![no_main]
 #![no_std]
 

examples/exti.rs

@@ -3,6 +3,7 @@
 //! Listens for interrupts on the pa7 pin. On any rising or falling edge, toggles
 //! the pc13 pin (which is connected to the LED on the blue pill board, hence the `led` name).
 
+#![allow(clippy::empty_loop)]
 #![no_main]
 #![no_std]
 

examples/hello.rs

@@ -1,5 +1,6 @@
 //! Prints "Hello, world" on the OpenOCD console
 
+#![allow(clippy::empty_loop)]
 #![deny(unsafe_code)]
 #![no_main]
 #![no_std]

examples/itm.rs

@@ -1,4 +1,5 @@
 #![deny(unsafe_code)]
+#![allow(clippy::empty_loop)]
 #![no_main]
 #![no_std]
 

examples/led.rs

@@ -9,6 +9,7 @@
 //! section 5.1.2 of the reference manual for an explanation.
 //! This is not an issue on the blue pill.
 
+#![allow(clippy::empty_loop)]
 #![deny(unsafe_code)]
 #![no_main]
 #![no_std]

examples/panics.rs

@@ -1,5 +1,6 @@
 //! Prints "Hello, world" on the OpenOCD console
 
+#![allow(clippy::empty_loop)]
 #![no_main]
 #![no_std]
 

examples/pwm.rs

@@ -1,6 +1,7 @@
 //! Testing PWM output for pre-defined pin combination: all pins for default mapping
 
 #![deny(unsafe_code)]
+#![allow(clippy::empty_loop)]
 #![no_main]
 #![no_std]
 

examples/pwm_custom.rs

@@ -1,6 +1,7 @@
 //! Testing PWM output for custom pin combinations
 
 #![deny(unsafe_code)]
+#![allow(clippy::empty_loop)]
 #![no_main]
 #![no_std]
 

examples/serial-dma-circ.rs

@@ -1,6 +1,7 @@
 //! Serial interface circular DMA RX transfer test
 
 #![deny(unsafe_code)]
+#![allow(clippy::empty_loop)]
 #![no_std]
 #![no_main]
 

examples/serial-dma-peek.rs

@@ -1,5 +1,6 @@
 //! Serial interface DMA RX transfer test
 
+#![allow(clippy::empty_loop)]
 #![deny(unsafe_code)]
 #![no_main]
 #![no_std]

examples/serial-dma-rx.rs

@@ -1,6 +1,7 @@
 //! Serial interface DMA RX transfer test
 
 #![deny(unsafe_code)]
+#![allow(clippy::empty_loop)]
 #![no_main]
 #![no_std]
 

examples/serial-dma-tx.rs

@@ -1,6 +1,7 @@
 //! Serial interface DMA TX transfer test
 
 #![deny(unsafe_code)]
+#![allow(clippy::empty_loop)]
 #![no_main]
 #![no_std]
 

examples/serial-fmt.rs

@@ -4,6 +4,7 @@
 //! so you can see the message in a serial console (e.g. Arduino console).
 
 #![deny(unsafe_code)]
+#![allow(clippy::empty_loop)]
 #![no_main]
 #![no_std]
 

examples/serial.rs

@@ -2,6 +2,7 @@
 //!
 //! You have to short the TX and RX pins to make this program work
 
+#![allow(clippy::empty_loop)]
 #![deny(unsafe_code)]
 #![no_main]
 #![no_std]

examples/serial_config.rs

@@ -3,6 +3,7 @@
 //! You have to short the TX and RX pins to make this program work
 
 #![deny(unsafe_code)]
+#![allow(clippy::empty_loop)]
 #![no_main]
 #![no_std]
 

examples/serial_reconfigure.rs

@@ -2,6 +2,7 @@
 //!
 //! You have to short the TX and RX pins to make this program work
 
+#![allow(clippy::empty_loop)]
 #![deny(unsafe_code)]
 #![no_main]
 #![no_std]

examples/spi-dma.rs

@@ -1,9 +1,9 @@
+//! Transmits data over an SPI port using DMA
+
+#![allow(clippy::empty_loop)]
 #![no_std]
 #![no_main]
 
-/**
-  Transmits data over an SPI port using DMA
-*/
 use panic_halt as _;
 
 use cortex_m_rt::entry;

examples/spi.rs

@@ -1,4 +1,5 @@
 #![deny(unsafe_code)]
+#![allow(clippy::empty_loop)]
 #![no_std]
 #![no_main]
 

src/i2c.rs

@@ -137,7 +137,7 @@ impl<PINS> I2c<I2C1, PINS> {
         PINS: Pins<I2C1>,
     {
         mapr.modify_mapr(|_, w| w.i2c1_remap().bit(PINS::REMAP));
-        I2c::<I2C1, _>::_i2c(i2c, pins, mode, clocks)
+        I2c::<I2C1, _>::configure(i2c, pins, mode, clocks)
     }
 }
 
@@ -147,7 +147,7 @@ impl<PINS> I2c<I2C2, PINS> {
     where
         PINS: Pins<I2C2>,
     {
-        I2c::<I2C2, _>::_i2c(i2c, pins, mode, clocks)
+        I2c::<I2C2, _>::configure(i2c, pins, mode, clocks)
     }
 }
 
@@ -156,7 +156,7 @@ where
     I2C: Instance,
 {
     /// Configures the I2C peripheral to work in master mode
-    fn _i2c<M: Into<Mode>>(i2c: I2C, pins: PINS, mode: M, clocks: Clocks) -> Self {
+    fn configure<M: Into<Mode>>(i2c: I2C, pins: PINS, mode: M, clocks: Clocks) -> Self {
         let mode = mode.into();
         let rcc = unsafe { &(*RCC::ptr()) };
         I2C::enable(rcc);

src/i2c/blocking.rs

@@ -35,7 +35,7 @@ impl<PINS> BlockingI2c<I2C1, PINS> {
         PINS: Pins<I2C1>,
     {
         mapr.modify_mapr(|_, w| w.i2c1_remap().bit(PINS::REMAP));
-        BlockingI2c::<I2C1, _>::_i2c(
+        BlockingI2c::<I2C1, _>::configure(
             i2c,
             pins,
             mode,
@@ -64,7 +64,7 @@ impl<PINS> BlockingI2c<I2C2, PINS> {
     where
         PINS: Pins<I2C2>,
     {
-        BlockingI2c::<I2C2, _>::_i2c(
+        BlockingI2c::<I2C2, _>::configure(
             i2c,
             pins,
             mode,
@@ -152,12 +152,9 @@ macro_rules! busy_wait {
 
 macro_rules! busy_wait_cycles {
     ($nb_expr:expr, $cycles:expr) => {{
-        let started = DWT::get_cycle_count();
+        let started = DWT::cycle_count();
         let cycles = $cycles;
-        busy_wait!(
-            $nb_expr,
-            DWT::get_cycle_count().wrapping_sub(started) >= cycles
-        )
+        busy_wait!($nb_expr, DWT::cycle_count().wrapping_sub(started) >= cycles)
     }};
 }
 
@@ -166,7 +163,7 @@ where
     I2C: Instance,
 {
     #[allow(clippy::too_many_arguments)]
-    fn _i2c<M: Into<Mode>>(
+    fn configure<M: Into<Mode>>(
         i2c: I2C,
         pins: PINS,
         mode: M,
@@ -176,7 +173,7 @@ where
         addr_timeout_us: u32,
         data_timeout_us: u32,
     ) -> Self {
-        I2c::<I2C, _>::_i2c(i2c, pins, mode, clocks).blocking(
+        I2c::<I2C, _>::configure(i2c, pins, mode, clocks).blocking(
             start_timeout_us,
             start_retries,
             addr_timeout_us,

src/rtc.rs

@@ -93,7 +93,7 @@ impl Rtc<RtcClkLse> {
 }
 
 impl Rtc<RtcClkLsi> {
-    pub fn rtc(regs: RTC, bkp: &mut BackupDomain) -> Self {
+    pub fn new_lsi(regs: RTC, bkp: &mut BackupDomain) -> Self {
         let mut result = Rtc {
             regs,
             _clock_source: PhantomData,
@@ -136,7 +136,7 @@ impl Rtc<RtcClkLsi> {
 }
 
 impl Rtc<RtcClkHseDiv128> {
-    pub fn rtc<F>(regs: RTC, bkp: &mut BackupDomain, hse: F) -> Self
+    pub fn new_hse<F>(regs: RTC, bkp: &mut BackupDomain, hse: F) -> Self
     where
         F: Into<Hertz>,
     {

src/spi.rs

@@ -173,7 +173,7 @@ impl<REMAP, PINS> Spi<SPI1, REMAP, PINS, u8> {
         PINS: Pins<REMAP>,
     {
         mapr.modify_mapr(|_, w| w.spi1_remap().bit(REMAP::REMAP));
-        Spi::<SPI1, _, _, u8>::_spi(spi, pins, mode, freq.into(), clocks)
+        Spi::<SPI1, _, _, u8>::configure(spi, pins, mode, freq.into(), clocks)
     }
 }
 
@@ -191,7 +191,7 @@ impl<REMAP, PINS> Spi<SPI2, REMAP, PINS, u8> {
         REMAP: Remap<Periph = SPI2>,
         PINS: Pins<REMAP>,
     {
-        Spi::<SPI2, _, _, u8>::_spi(spi, pins, mode, freq.into(), clocks)
+        Spi::<SPI2, _, _, u8>::configure(spi, pins, mode, freq.into(), clocks)
     }
 }
 
@@ -211,7 +211,7 @@ impl<REMAP, PINS> Spi<SPI3, REMAP, PINS, u8> {
         REMAP: Remap<Periph = SPI3>,
         PINS: Pins<REMAP>,
     {
-        Spi::<SPI3, _, _, u8>::_spi(spi, pins, mode, freq.into(), clocks)
+        Spi::<SPI3, _, _, u8>::configure(spi, pins, mode, freq.into(), clocks)
     }
 
     /**
@@ -236,7 +236,7 @@ impl<REMAP, PINS> Spi<SPI3, REMAP, PINS, u8> {
         PINS: Pins<REMAP>,
     {
         mapr.modify_mapr(|_, w| w.spi3_remap().bit(REMAP::REMAP));
-        Spi::<SPI3, _, _, u8>::_spi(spi, pins, mode, freq.into(), clocks)
+        Spi::<SPI3, _, _, u8>::configure(spi, pins, mode, freq.into(), clocks)
     }
 }
 
@@ -333,7 +333,7 @@ impl<SPI, REMAP, PINS> Spi<SPI, REMAP, PINS, u8>
 where
     SPI: Instance,
 {
-    fn _spi(spi: SPI, pins: PINS, mode: Mode, freq: Hertz, clocks: Clocks) -> Self {
+    fn configure(spi: SPI, pins: PINS, mode: Mode, freq: Hertz, clocks: Clocks) -> Self {
         // enable or reset SPI
         let rcc = unsafe { &(*RCC::ptr()) };
         SPI::enable(rcc);

src/time.rs

@@ -259,7 +259,7 @@ impl MonoTimer {
     /// Returns an `Instant` corresponding to "now"
     pub fn now(self) -> Instant {
         Instant {
-            now: DWT::get_cycle_count(),
+            now: DWT::cycle_count(),
         }
     }
 }
@@ -273,6 +273,6 @@ pub struct Instant {
 impl Instant {
     /// Ticks elapsed since the `Instant` was created
     pub fn elapsed(self) -> u32 {
-        DWT::get_cycle_count().wrapping_sub(self.now)
+        DWT::cycle_count().wrapping_sub(self.now)
     }
 }