make clippy happy

stm32-rs · Mar 17, 2024 · ebf0a15 · ebf0a15
1 parent e6145ef
commit ebf0a15
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 15 deletions.
diff --git a/src/crc.rs b/src/crc.rs
@@ -173,8 +173,12 @@ impl Crc {
     pub fn feed(&mut self, data: &[u8]) {
         let crc = unsafe { &(*CRC::ptr()) };
         for byte in data {
-            let ptr = &crc.dr as *const _;
-            unsafe { core::ptr::write_volatile(ptr as *mut u8, *byte) };
+            unsafe {
+                core::ptr::write_volatile(
+                    core::cell::UnsafeCell::raw_get(&crc.dr as *const _ as _),
+                    byte,
+                )
+            }
         }
     }
 

diff --git a/src/rtc.rs b/src/rtc.rs
@@ -193,10 +193,10 @@ impl Rtc {
 
     pub fn set_alarm_a(&mut self, alarm: impl Into<Alarm>) {
         let alarm = alarm.into();
-        let (dt, du) = bcd2_encode(alarm.day.unwrap_or_default() as u32);
-        let (ht, hu) = bcd2_encode(alarm.hours.unwrap_or_default() as u32);
-        let (mt, mu) = bcd2_encode(alarm.minutes.unwrap_or_default() as u32);
-        let (st, su) = bcd2_encode(alarm.seconds.unwrap_or_default() as u32);
+        let (dt, du) = bcd2_encode(alarm.day.unwrap_or_default());
+        let (ht, hu) = bcd2_encode(alarm.hours.unwrap_or_default());
+        let (mt, mu) = bcd2_encode(alarm.minutes.unwrap_or_default());
+        let (st, su) = bcd2_encode(alarm.seconds.unwrap_or_default());
 
         self.modify(|rb| {
             rb.alrmassr.write(|w| unsafe {
@@ -226,10 +226,10 @@ impl Rtc {
     }
 
     pub fn set_alarm_b(&mut self, alarm: Alarm) {
-        let (dt, du) = bcd2_encode(alarm.day.unwrap_or_default() as u32);
-        let (ht, hu) = bcd2_encode(alarm.hours.unwrap_or_default() as u32);
-        let (mt, mu) = bcd2_encode(alarm.minutes.unwrap_or_default() as u32);
-        let (st, su) = bcd2_encode(alarm.seconds.unwrap_or_default() as u32);
+        let (dt, du) = bcd2_encode(alarm.day.unwrap_or_default());
+        let (ht, hu) = bcd2_encode(alarm.hours.unwrap_or_default());
+        let (mt, mu) = bcd2_encode(alarm.minutes.unwrap_or_default());
+        let (st, su) = bcd2_encode(alarm.seconds.unwrap_or_default());
 
         self.modify(|rb| {
             rb.alrmbssr.write(|w| unsafe {
@@ -387,7 +387,7 @@ fn bcd2_encode(word: u32) -> (u8, u8) {
         bcd_high += 1;
         value -= 10;
     }
-    let bcd_low = ((bcd_high << 4) | value) as u8;
+    let bcd_low = (bcd_high << 4) | value;
     (bcd_high, bcd_low)
 }
 

diff --git a/src/spi.rs b/src/spi.rs
@@ -2,7 +2,7 @@ use crate::gpio::*;
 use crate::rcc::*;
 use crate::stm32::{SPI1, SPI2};
 use crate::time::Hertz;
-use core::ptr;
+use core::{cell, ptr};
 pub use hal::spi::{Mode, Phase, Polarity, MODE_0, MODE_1, MODE_2, MODE_3};
 
 /// SPI error
@@ -264,8 +264,9 @@ macro_rules! spi {
                 } else if sr.crcerr().bit_is_set() {
                     nb::Error::Other(Error::Crc)
                 } else if sr.txe().bit_is_set() {
-                    let ptr = &self.spi.dr as *const _;
-                    unsafe { core::ptr::write_volatile(ptr as *mut u8, byte) };
+                    unsafe {
+                        ptr::write_volatile(cell::UnsafeCell::raw_get(&self.spi.dr as *const _ as _), byte)
+                    }
                     return Ok(());
                 } else {
                     nb::Error::WouldBlock

diff --git a/src/timer/pwm.rs b/src/timer/pwm.rs
@@ -269,7 +269,7 @@ pwm_advanced_hal! {
     TIM17: (Channel1, cc1e: cc1ne, ccmr1_output, oc1pe, oc1m, ccr1, moe),
 }
 
-#[cfg(any(feature = "stm32g070"))]
+#[cfg(feature = "stm32g070")]
 pwm_advanced_hal! {
     TIM15: (Channel1, cc1e: cc1ne, ccmr1_output, oc1pe, oc1m1, ccr1, moe),
 }