Skip to content

Commit 513df54

Browse files
burrbullburrbull
committed
clippy 1.89
1 parent d6d19c6 commit 513df54

File tree

9 files changed

+147
-162
lines changed

9 files changed

+147
-162
lines changed

‎examples/blinky_rtcalarm_irq.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ fn RTCALARM() {
6969
exti.pr().write(|w| w.pr17().clear_bit_by_one());
7070
rtc.set_alarm(rtc.current_time() + TOGGLE_INTERVAL_SECONDS);
7171

72-
let _ = led.toggle();
72+
led.toggle();
7373
}
7474

7575
#[cfg(not(feature = "stm32f101"))]
@@ -83,7 +83,7 @@ fn main() -> ! {
8383
// Set up the GPIO pin
8484
let mut gpioc = dp.GPIOC.split(&mut rcc);
8585
let mut led = gpioc.pc13.into_push_pull_output(&mut gpioc.crh);
86-
let _ = led.set_high(); // Turn off
86+
led.set_high(); // Turn off
8787

8888
cortex_m::interrupt::free(|cs| *G_LED.borrow(cs).borrow_mut() = Some(led));
8989

‎examples/blinky_timer_irq.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ fn TIM2() {
6262
})
6363
});
6464

65-
let _ = led.toggle();
66-
let _ = tim.wait();
65+
led.toggle();
66+
tim.wait().ok();
6767
}
6868

6969
#[entry]

‎examples/can-loopback.rs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,5 +112,7 @@ fn main() -> ! {
112112
let mut led = gpiob.pb9.into_push_pull_output(&mut gpiob.crh);
113113
led.set_high();
114114

115-
loop {}
115+
loop {
116+
continue;
117+
}
116118
}

‎examples/can-rtic.rs‎

Lines changed: 11 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -134,31 +134,19 @@ mod app {
134134
let mut tx_queue = cx.shared.can_tx_queue;
135135

136136
// Enqueue some messages. Higher ID means lower priority.
137-
tx_queue.lock(|mut tx_queue| {
138-
enqueue_frame(
139-
&mut tx_queue,
140-
Frame::new_data(StandardId::new(9).unwrap(), []),
141-
);
142-
enqueue_frame(
143-
&mut tx_queue,
144-
Frame::new_data(ExtendedId::new(9).unwrap(), []),
145-
);
137+
tx_queue.lock(|tx_queue| {
138+
enqueue_frame(tx_queue, Frame::new_data(StandardId::new(9).unwrap(), []));
139+
enqueue_frame(tx_queue, Frame::new_data(ExtendedId::new(9).unwrap(), []));
146140

147-
enqueue_frame(
148-
&mut tx_queue,
149-
Frame::new_data(StandardId::new(8).unwrap(), []),
150-
);
151-
enqueue_frame(
152-
&mut tx_queue,
153-
Frame::new_data(ExtendedId::new(8).unwrap(), []),
154-
);
141+
enqueue_frame(tx_queue, Frame::new_data(StandardId::new(8).unwrap(), []));
142+
enqueue_frame(tx_queue, Frame::new_data(ExtendedId::new(8).unwrap(), []));
155143

156144
enqueue_frame(
157-
&mut tx_queue,
145+
tx_queue,
158146
Frame::new_data(StandardId::new(0x7FF).unwrap(), []),
159147
);
160148
enqueue_frame(
161-
&mut tx_queue,
149+
tx_queue,
162150
Frame::new_data(ExtendedId::new(0x1FFF_FFFF).unwrap(), []),
163151
);
164152
});
@@ -168,19 +156,10 @@ mod app {
168156
let tx_count = cx.shared.tx_count.lock(|tx_count| *tx_count);
169157

170158
if tx_count >= 3 {
171-
tx_queue.lock(|mut tx_queue| {
172-
enqueue_frame(
173-
&mut tx_queue,
174-
Frame::new_data(StandardId::new(3).unwrap(), []),
175-
);
176-
enqueue_frame(
177-
&mut tx_queue,
178-
Frame::new_data(StandardId::new(2).unwrap(), []),
179-
);
180-
enqueue_frame(
181-
&mut tx_queue,
182-
Frame::new_data(StandardId::new(1).unwrap(), []),
183-
);
159+
tx_queue.lock(|tx_queue| {
160+
enqueue_frame(tx_queue, Frame::new_data(StandardId::new(3).unwrap(), []));
161+
enqueue_frame(tx_queue, Frame::new_data(StandardId::new(2).unwrap(), []));
162+
enqueue_frame(tx_queue, Frame::new_data(StandardId::new(1).unwrap(), []));
184163
});
185164
break;
186165
}

‎examples/mpu9250.rs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,5 +56,7 @@ fn main() -> ! {
5656

5757
asm::bkpt();
5858

59-
loop {}
59+
loop {
60+
continue;
61+
}
6062
}

‎examples/usb_serial_interrupt.rs‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,18 +57,20 @@ fn main() -> ! {
5757

5858
USB_BUS = Some(bus);
5959

60-
USB_SERIAL = Some(SerialPort::new(USB_BUS.as_ref().unwrap()));
61-
62-
let usb_dev = UsbDeviceBuilder::new(USB_BUS.as_ref().unwrap(), UsbVidPid(0x16c0, 0x27dd))
63-
.device_class(USB_CLASS_CDC)
64-
.strings(&[StringDescriptors::default()
65-
.manufacturer("Fake Company")
66-
.product("Serial port")
67-
.serial_number("TEST")])
68-
.unwrap()
69-
.build();
70-
71-
USB_DEVICE = Some(usb_dev);
60+
if let Some(bus) = USB_BUS.as_ref() {
61+
USB_SERIAL = Some(SerialPort::new(bus));
62+
63+
let usb_dev = UsbDeviceBuilder::new(bus, UsbVidPid(0x16c0, 0x27dd))
64+
.device_class(USB_CLASS_CDC)
65+
.strings(&[StringDescriptors::default()
66+
.manufacturer("Fake Company")
67+
.product("Serial port")
68+
.serial_number("TEST")])
69+
.unwrap()
70+
.build();
71+
72+
USB_DEVICE = Some(usb_dev);
73+
}
7274
}
7375

7476
unsafe {

‎src/flash.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ pub struct Parts {
348348
pub(crate) _wrpr: WRPR,
349349
}
350350
impl Parts {
351-
pub fn writer(&mut self, sector_sz: SectorSize, flash_sz: FlashSize) -> FlashWriter {
351+
pub fn writer(&mut self, sector_sz: SectorSize, flash_sz: FlashSize) -> FlashWriter<'_> {
352352
FlashWriter {
353353
flash: self,
354354
sector_sz,

‎src/pacext/adc.rs‎

Lines changed: 69 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -70,18 +70,18 @@ wrap_r! {
7070

7171
wrap_w! {
7272
pub trait Cr1W {
73-
fn awdch(&mut self) -> adc1::cr1::AWDCH_W<REG>;
74-
fn eocie(&mut self) -> adc1::cr1::EOCIE_W<REG>;
75-
fn awdie(&mut self) -> adc1::cr1::AWDIE_W<REG>;
76-
fn jeocie(&mut self) -> adc1::cr1::JEOCIE_W<REG>;
77-
fn scan(&mut self) -> adc1::cr1::SCAN_W<REG>;
78-
fn awdsgl(&mut self) -> adc1::cr1::AWDSGL_W<REG>;
79-
fn jauto(&mut self) -> adc1::cr1::JAUTO_W<REG>;
80-
fn discen(&mut self) -> adc1::cr1::DISCEN_W<REG>;
81-
fn jdiscen(&mut self) -> adc1::cr1::JDISCEN_W<REG>;
82-
fn discnum(&mut self) -> adc1::cr1::DISCNUM_W<REG>;
83-
fn jawden(&mut self) -> adc1::cr1::JAWDEN_W<REG>;
84-
fn awden(&mut self) -> adc1::cr1::AWDEN_W<REG>;
73+
fn awdch(&mut self) -> adc1::cr1::AWDCH_W<'_, REG>;
74+
fn eocie(&mut self) -> adc1::cr1::EOCIE_W<'_, REG>;
75+
fn awdie(&mut self) -> adc1::cr1::AWDIE_W<'_, REG>;
76+
fn jeocie(&mut self) -> adc1::cr1::JEOCIE_W<'_, REG>;
77+
fn scan(&mut self) -> adc1::cr1::SCAN_W<'_, REG>;
78+
fn awdsgl(&mut self) -> adc1::cr1::AWDSGL_W<'_, REG>;
79+
fn jauto(&mut self) -> adc1::cr1::JAUTO_W<'_, REG>;
80+
fn discen(&mut self) -> adc1::cr1::DISCEN_W<'_, REG>;
81+
fn jdiscen(&mut self) -> adc1::cr1::JDISCEN_W<'_, REG>;
82+
fn discnum(&mut self) -> adc1::cr1::DISCNUM_W<'_, REG>;
83+
fn jawden(&mut self) -> adc1::cr1::JAWDEN_W<'_, REG>;
84+
fn awden(&mut self) -> adc1::cr1::AWDEN_W<'_, REG>;
8585
}
8686
}
8787

@@ -103,17 +103,17 @@ wrap_r! {
103103

104104
wrap_w! {
105105
pub trait Cr2W {
106-
fn adon(&mut self) -> adc1::cr2::ADON_W<REG>;
107-
fn cont(&mut self) -> adc1::cr2::CONT_W<REG>;
108-
fn cal(&mut self) -> adc1::cr2::CAL_W<REG>;
109-
fn rstcal(&mut self) -> adc1::cr2::RSTCAL_W<REG>;
110-
fn dma(&mut self) -> adc1::cr2::DMA_W<REG>;
111-
fn align(&mut self) -> adc1::cr2::ALIGN_W<REG>;
112-
fn jexttrig(&mut self) -> adc1::cr2::JEXTTRIG_W<REG>;
113-
fn exttrig(&mut self) -> adc1::cr2::EXTTRIG_W<REG>;
114-
fn jswstart(&mut self) -> adc1::cr2::JSWSTART_W<REG>;
115-
fn swstart(&mut self) -> adc1::cr2::SWSTART_W<REG>;
116-
fn tsvrefe(&mut self) -> adc1::cr2::TSVREFE_W<REG>;
106+
fn adon(&mut self) -> adc1::cr2::ADON_W<'_, REG>;
107+
fn cont(&mut self) -> adc1::cr2::CONT_W<'_, REG>;
108+
fn cal(&mut self) -> adc1::cr2::CAL_W<'_, REG>;
109+
fn rstcal(&mut self) -> adc1::cr2::RSTCAL_W<'_, REG>;
110+
fn dma(&mut self) -> adc1::cr2::DMA_W<'_, REG>;
111+
fn align(&mut self) -> adc1::cr2::ALIGN_W<'_, REG>;
112+
fn jexttrig(&mut self) -> adc1::cr2::JEXTTRIG_W<'_, REG>;
113+
fn exttrig(&mut self) -> adc1::cr2::EXTTRIG_W<'_, REG>;
114+
fn jswstart(&mut self) -> adc1::cr2::JSWSTART_W<'_, REG>;
115+
fn swstart(&mut self) -> adc1::cr2::SWSTART_W<'_, REG>;
116+
fn tsvrefe(&mut self) -> adc1::cr2::TSVREFE_W<'_, REG>;
117117
}
118118
}
119119

@@ -152,18 +152,18 @@ mod reg {
152152
}
153153

154154
pub trait Cr1W: RegisterSpec<Ux = u32> + Writable + Resettable + Sized {
155-
fn awdch(w: &mut W<Self>) -> adc1::cr1::AWDCH_W<Self>;
156-
fn eocie(w: &mut W<Self>) -> adc1::cr1::EOCIE_W<Self>;
157-
fn awdie(w: &mut W<Self>) -> adc1::cr1::AWDIE_W<Self>;
158-
fn jeocie(w: &mut W<Self>) -> adc1::cr1::JEOCIE_W<Self>;
159-
fn scan(w: &mut W<Self>) -> adc1::cr1::SCAN_W<Self>;
160-
fn awdsgl(w: &mut W<Self>) -> adc1::cr1::AWDSGL_W<Self>;
161-
fn jauto(w: &mut W<Self>) -> adc1::cr1::JAUTO_W<Self>;
162-
fn discen(w: &mut W<Self>) -> adc1::cr1::DISCEN_W<Self>;
163-
fn jdiscen(w: &mut W<Self>) -> adc1::cr1::JDISCEN_W<Self>;
164-
fn discnum(w: &mut W<Self>) -> adc1::cr1::DISCNUM_W<Self>;
165-
fn jawden(w: &mut W<Self>) -> adc1::cr1::JAWDEN_W<Self>;
166-
fn awden(w: &mut W<Self>) -> adc1::cr1::AWDEN_W<Self>;
155+
fn awdch(w: &mut W<Self>) -> adc1::cr1::AWDCH_W<'_, Self>;
156+
fn eocie(w: &mut W<Self>) -> adc1::cr1::EOCIE_W<'_, Self>;
157+
fn awdie(w: &mut W<Self>) -> adc1::cr1::AWDIE_W<'_, Self>;
158+
fn jeocie(w: &mut W<Self>) -> adc1::cr1::JEOCIE_W<'_, Self>;
159+
fn scan(w: &mut W<Self>) -> adc1::cr1::SCAN_W<'_, Self>;
160+
fn awdsgl(w: &mut W<Self>) -> adc1::cr1::AWDSGL_W<'_, Self>;
161+
fn jauto(w: &mut W<Self>) -> adc1::cr1::JAUTO_W<'_, Self>;
162+
fn discen(w: &mut W<Self>) -> adc1::cr1::DISCEN_W<'_, Self>;
163+
fn jdiscen(w: &mut W<Self>) -> adc1::cr1::JDISCEN_W<'_, Self>;
164+
fn discnum(w: &mut W<Self>) -> adc1::cr1::DISCNUM_W<'_, Self>;
165+
fn jawden(w: &mut W<Self>) -> adc1::cr1::JAWDEN_W<'_, Self>;
166+
fn awden(w: &mut W<Self>) -> adc1::cr1::AWDEN_W<'_, Self>;
167167
}
168168

169169
pub trait Cr2R: RegisterSpec<Ux = u32> + Readable + Sized {
@@ -180,17 +180,17 @@ mod reg {
180180
fn tsvrefe(r: &R<Self>) -> adc1::cr2::TSVREFE_R;
181181
}
182182
pub trait Cr2W: RegisterSpec<Ux = u32> + Writable + Resettable + Sized + ExtSelW {
183-
fn adon(w: &mut W<Self>) -> adc1::cr2::ADON_W<Self>;
184-
fn cont(w: &mut W<Self>) -> adc1::cr2::CONT_W<Self>;
185-
fn cal(w: &mut W<Self>) -> adc1::cr2::CAL_W<Self>;
186-
fn rstcal(w: &mut W<Self>) -> adc1::cr2::RSTCAL_W<Self>;
187-
fn dma(w: &mut W<Self>) -> adc1::cr2::DMA_W<Self>;
188-
fn align(w: &mut W<Self>) -> adc1::cr2::ALIGN_W<Self>;
189-
fn jexttrig(w: &mut W<Self>) -> adc1::cr2::JEXTTRIG_W<Self>;
190-
fn exttrig(w: &mut W<Self>) -> adc1::cr2::EXTTRIG_W<Self>;
191-
fn jswstart(w: &mut W<Self>) -> adc1::cr2::JSWSTART_W<Self>;
192-
fn swstart(w: &mut W<Self>) -> adc1::cr2::SWSTART_W<Self>;
193-
fn tsvrefe(w: &mut W<Self>) -> adc1::cr2::TSVREFE_W<Self>;
183+
fn adon(w: &mut W<Self>) -> adc1::cr2::ADON_W<'_, Self>;
184+
fn cont(w: &mut W<Self>) -> adc1::cr2::CONT_W<'_, Self>;
185+
fn cal(w: &mut W<Self>) -> adc1::cr2::CAL_W<'_, Self>;
186+
fn rstcal(w: &mut W<Self>) -> adc1::cr2::RSTCAL_W<'_, Self>;
187+
fn dma(w: &mut W<Self>) -> adc1::cr2::DMA_W<'_, Self>;
188+
fn align(w: &mut W<Self>) -> adc1::cr2::ALIGN_W<'_, Self>;
189+
fn jexttrig(w: &mut W<Self>) -> adc1::cr2::JEXTTRIG_W<'_, Self>;
190+
fn exttrig(w: &mut W<Self>) -> adc1::cr2::EXTTRIG_W<'_, Self>;
191+
fn jswstart(w: &mut W<Self>) -> adc1::cr2::JSWSTART_W<'_, Self>;
192+
fn swstart(w: &mut W<Self>) -> adc1::cr2::SWSTART_W<'_, Self>;
193+
fn tsvrefe(w: &mut W<Self>) -> adc1::cr2::TSVREFE_W<'_, Self>;
194194
}
195195
pub trait Dr: RegisterSpec<Ux = u32> + Readable + Sized {
196196
fn data(r: &R<Self>) -> adc1::dr::DATA_R;
@@ -244,18 +244,18 @@ macro_rules! impl_ext {
244244
}
245245
impl reg::Cr1W for $adc::cr1::CR1rs {
246246
impl_write! {
247-
awdch -> adc1::cr1::AWDCH_W<Self>;
248-
eocie -> adc1::cr1::EOCIE_W<Self>;
249-
awdie -> adc1::cr1::AWDIE_W<Self>;
250-
jeocie -> adc1::cr1::JEOCIE_W<Self>;
251-
scan -> adc1::cr1::SCAN_W<Self>;
252-
awdsgl -> adc1::cr1::AWDSGL_W<Self>;
253-
jauto -> adc1::cr1::JAUTO_W<Self>;
254-
discen -> adc1::cr1::DISCEN_W<Self>;
255-
jdiscen -> adc1::cr1::JDISCEN_W<Self>;
256-
discnum -> adc1::cr1::DISCNUM_W<Self>;
257-
jawden -> adc1::cr1::JAWDEN_W<Self>;
258-
awden -> adc1::cr1::AWDEN_W<Self>;
247+
awdch -> adc1::cr1::AWDCH_W<'_, Self>;
248+
eocie -> adc1::cr1::EOCIE_W<'_, Self>;
249+
awdie -> adc1::cr1::AWDIE_W<'_, Self>;
250+
jeocie -> adc1::cr1::JEOCIE_W<'_, Self>;
251+
scan -> adc1::cr1::SCAN_W<'_, Self>;
252+
awdsgl -> adc1::cr1::AWDSGL_W<'_, Self>;
253+
jauto -> adc1::cr1::JAUTO_W<'_, Self>;
254+
discen -> adc1::cr1::DISCEN_W<'_, Self>;
255+
jdiscen -> adc1::cr1::JDISCEN_W<'_, Self>;
256+
discnum -> adc1::cr1::DISCNUM_W<'_, Self>;
257+
jawden -> adc1::cr1::JAWDEN_W<'_, Self>;
258+
awden -> adc1::cr1::AWDEN_W<'_, Self>;
259259
}
260260
}
261261
impl reg::Dr for $adc::dr::DRrs {
@@ -285,17 +285,17 @@ macro_rules! impl_cr2 {
285285
}
286286
impl reg::Cr2W for $adc::cr2::CR2rs {
287287
impl_write! {
288-
adon -> adc1::cr2::ADON_W<Self>;
289-
cont -> adc1::cr2::CONT_W<Self>;
290-
cal -> adc1::cr2::CAL_W<Self>;
291-
rstcal -> adc1::cr2::RSTCAL_W<Self>;
292-
dma -> adc1::cr2::DMA_W<Self>;
293-
align -> adc1::cr2::ALIGN_W<Self>;
294-
jexttrig -> adc1::cr2::JEXTTRIG_W<Self>;
295-
exttrig -> adc1::cr2::EXTTRIG_W<Self>;
296-
jswstart -> adc1::cr2::JSWSTART_W<Self>;
297-
swstart -> adc1::cr2::SWSTART_W<Self>;
298-
tsvrefe -> adc1::cr2::TSVREFE_W<Self>;
288+
adon -> adc1::cr2::ADON_W<'_, Self>;
289+
cont -> adc1::cr2::CONT_W<'_, Self>;
290+
cal -> adc1::cr2::CAL_W<'_, Self>;
291+
rstcal -> adc1::cr2::RSTCAL_W<'_, Self>;
292+
dma -> adc1::cr2::DMA_W<'_, Self>;
293+
align -> adc1::cr2::ALIGN_W<'_, Self>;
294+
jexttrig -> adc1::cr2::JEXTTRIG_W<'_, Self>;
295+
exttrig -> adc1::cr2::EXTTRIG_W<'_, Self>;
296+
jswstart -> adc1::cr2::JSWSTART_W<'_, Self>;
297+
swstart -> adc1::cr2::SWSTART_W<'_, Self>;
298+
tsvrefe -> adc1::cr2::TSVREFE_W<'_, Self>;
299299
}
300300
}
301301
impl reg::ExtSelW for $adc::cr2::CR2rs {

0 commit comments

Comments
 (0)