Skip to content

Commit ebf0a15

Browse files
committed
make clippy happy
1 parent e6145ef commit ebf0a15

File tree

4 files changed

+20
-15
lines changed

4 files changed

+20
-15
lines changed

src/crc.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,12 @@ impl Crc {
173173
pub fn feed(&mut self, data: &[u8]) {
174174
let crc = unsafe { &(*CRC::ptr()) };
175175
for byte in data {
176-
let ptr = &crc.dr as *const _;
177-
unsafe { core::ptr::write_volatile(ptr as *mut u8, *byte) };
176+
unsafe {
177+
core::ptr::write_volatile(
178+
core::cell::UnsafeCell::raw_get(&crc.dr as *const _ as _),
179+
byte,
180+
)
181+
}
178182
}
179183
}
180184

src/rtc.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -193,10 +193,10 @@ impl Rtc {
193193

194194
pub fn set_alarm_a(&mut self, alarm: impl Into<Alarm>) {
195195
let alarm = alarm.into();
196-
let (dt, du) = bcd2_encode(alarm.day.unwrap_or_default() as u32);
197-
let (ht, hu) = bcd2_encode(alarm.hours.unwrap_or_default() as u32);
198-
let (mt, mu) = bcd2_encode(alarm.minutes.unwrap_or_default() as u32);
199-
let (st, su) = bcd2_encode(alarm.seconds.unwrap_or_default() as u32);
196+
let (dt, du) = bcd2_encode(alarm.day.unwrap_or_default());
197+
let (ht, hu) = bcd2_encode(alarm.hours.unwrap_or_default());
198+
let (mt, mu) = bcd2_encode(alarm.minutes.unwrap_or_default());
199+
let (st, su) = bcd2_encode(alarm.seconds.unwrap_or_default());
200200

201201
self.modify(|rb| {
202202
rb.alrmassr.write(|w| unsafe {
@@ -226,10 +226,10 @@ impl Rtc {
226226
}
227227

228228
pub fn set_alarm_b(&mut self, alarm: Alarm) {
229-
let (dt, du) = bcd2_encode(alarm.day.unwrap_or_default() as u32);
230-
let (ht, hu) = bcd2_encode(alarm.hours.unwrap_or_default() as u32);
231-
let (mt, mu) = bcd2_encode(alarm.minutes.unwrap_or_default() as u32);
232-
let (st, su) = bcd2_encode(alarm.seconds.unwrap_or_default() as u32);
229+
let (dt, du) = bcd2_encode(alarm.day.unwrap_or_default());
230+
let (ht, hu) = bcd2_encode(alarm.hours.unwrap_or_default());
231+
let (mt, mu) = bcd2_encode(alarm.minutes.unwrap_or_default());
232+
let (st, su) = bcd2_encode(alarm.seconds.unwrap_or_default());
233233

234234
self.modify(|rb| {
235235
rb.alrmbssr.write(|w| unsafe {
@@ -387,7 +387,7 @@ fn bcd2_encode(word: u32) -> (u8, u8) {
387387
bcd_high += 1;
388388
value -= 10;
389389
}
390-
let bcd_low = ((bcd_high << 4) | value) as u8;
390+
let bcd_low = (bcd_high << 4) | value;
391391
(bcd_high, bcd_low)
392392
}
393393

src/spi.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use crate::gpio::*;
22
use crate::rcc::*;
33
use crate::stm32::{SPI1, SPI2};
44
use crate::time::Hertz;
5-
use core::ptr;
5+
use core::{cell, ptr};
66
pub use hal::spi::{Mode, Phase, Polarity, MODE_0, MODE_1, MODE_2, MODE_3};
77

88
/// SPI error
@@ -264,8 +264,9 @@ macro_rules! spi {
264264
} else if sr.crcerr().bit_is_set() {
265265
nb::Error::Other(Error::Crc)
266266
} else if sr.txe().bit_is_set() {
267-
let ptr = &self.spi.dr as *const _;
268-
unsafe { core::ptr::write_volatile(ptr as *mut u8, byte) };
267+
unsafe {
268+
ptr::write_volatile(cell::UnsafeCell::raw_get(&self.spi.dr as *const _ as _), byte)
269+
}
269270
return Ok(());
270271
} else {
271272
nb::Error::WouldBlock

src/timer/pwm.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ pwm_advanced_hal! {
269269
TIM17: (Channel1, cc1e: cc1ne, ccmr1_output, oc1pe, oc1m, ccr1, moe),
270270
}
271271

272-
#[cfg(any(feature = "stm32g070"))]
272+
#[cfg(feature = "stm32g070")]
273273
pwm_advanced_hal! {
274274
TIM15: (Channel1, cc1e: cc1ne, ccmr1_output, oc1pe, oc1m1, ccr1, moe),
275275
}

0 commit comments

Comments
 (0)