Skip to content

Commit 79997ad

Browse files
authored
Fix clippy warnings in current beta (#930)
1 parent b9bbfad commit 79997ad

File tree

16 files changed

+61
-69
lines changed

16 files changed

+61
-69
lines changed

rp2040-hal-examples/src/bin/adc_fifo_dma.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ fn main() -> ! {
177177
.unwrap();
178178
}
179179

180-
writeln!(uart, "Sampling took: {}\r", time_taken).unwrap();
180+
writeln!(uart, "Sampling took: {time_taken}\r").unwrap();
181181

182182
loop {
183183
delay.delay_ms(1000);

rp2040-hal-examples/src/bin/adc_fifo_irq.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ mod app {
146146
|done, buf, uart| {
147147
if *done {
148148
for sample in buf {
149-
writeln!(uart, "Sample: {}\r", sample).unwrap();
149+
writeln!(uart, "Sample: {sample}\r").unwrap();
150150
}
151151
writeln!(uart, "All done, going to sleep 😴\r").unwrap();
152152
true

rp2040-hal-examples/src/bin/adc_fifo_poll.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ fn main() -> ! {
184184
.unwrap();
185185
}
186186

187-
writeln!(uart, "Sampling took: {}\r", time_taken).unwrap();
187+
writeln!(uart, "Sampling took: {time_taken}\r").unwrap();
188188

189189
loop {
190190
delay.delay_ms(1000);

rp2040-hal-examples/src/bin/spi_eh_bus.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -281,19 +281,19 @@ fn main() -> ! {
281281
}
282282
Err(e) => {
283283
// Do something on failure
284-
_ = writeln!(uart, "Device write error: {:?}", e);
284+
_ = writeln!(uart, "Device write error: {e:?}");
285285
}
286286
}
287287

288288
// Let's read from the device
289289
match driver.get_value() {
290290
Ok(value) => {
291291
// Do something on success
292-
_ = writeln!(uart, "Read value: {}", value);
292+
_ = writeln!(uart, "Read value: {value}");
293293
}
294294
Err(e) => {
295295
// Do something on failure
296-
_ = writeln!(uart, "Device write error: {:?}", e);
296+
_ = writeln!(uart, "Device write error: {e:?}");
297297
}
298298
}
299299

rp2040-hal-examples/src/bin/uart_loopback.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ fn main() -> ! {
263263
_ = writeln!(uart0, "RX: {:?}", &buffer[0..n]);
264264
}
265265
Err(e) => {
266-
_ = writeln!(uart0, "RXE: {:?}", e);
266+
_ = writeln!(uart0, "RXE: {e:?}");
267267
}
268268
}
269269
_ = writeln!(uart0, "I want to see RX: [4, 5, 6]");
@@ -272,7 +272,7 @@ fn main() -> ! {
272272
_ = writeln!(uart0, "RX: {:?}", &buffer[0..n]);
273273
}
274274
Err(e) => {
275-
_ = writeln!(uart0, "RXE: {:?}", e);
275+
_ = writeln!(uart0, "RXE: {e:?}");
276276
}
277277
}
278278
_ = writeln!(uart0, "I want to see WouldBlock");
@@ -281,7 +281,7 @@ fn main() -> ! {
281281
_ = writeln!(uart0, "RX: {:?}", &buffer[0..n]);
282282
}
283283
Err(e) => {
284-
_ = writeln!(uart0, "RXE: {:?}", e);
284+
_ = writeln!(uart0, "RXE: {e:?}");
285285
}
286286
}
287287

@@ -352,7 +352,7 @@ fn main() -> ! {
352352
_ = writeln!(uart0, "RX: {:?}", &buffer[0..n]);
353353
}
354354
Err(e) => {
355-
_ = writeln!(uart0, "RXE: {:?}", e);
355+
_ = writeln!(uart0, "RXE: {e:?}");
356356
}
357357
}
358358
_ = writeln!(uart0, "I want to see ParityError");
@@ -361,7 +361,7 @@ fn main() -> ! {
361361
_ = writeln!(uart0, "RX: {:?}", &buffer[0..n]);
362362
}
363363
Err(e) => {
364-
_ = writeln!(uart0, "RXE: {:?}", e);
364+
_ = writeln!(uart0, "RXE: {e:?}");
365365
}
366366
}
367367

@@ -371,17 +371,17 @@ fn main() -> ! {
371371
_ = writeln!(uart0, "RX: {:?}", &buffer[0..n]);
372372
}
373373
Err(e) => {
374-
_ = writeln!(uart0, "RXE: {:?}", e);
374+
_ = writeln!(uart0, "RXE: {e:?}");
375375
}
376376
}
377377

378378
_ = writeln!(uart0, "I want to see RX ready: false");
379379
match embedded_io::ReadReady::read_ready(&mut uart0) {
380380
Ok(ready) => {
381-
_ = writeln!(uart0, "RX ready: {}", ready);
381+
_ = writeln!(uart0, "RX ready: {ready}");
382382
}
383383
Err(e) => {
384-
_ = writeln!(uart0, "RXE: {:?}", e);
384+
_ = writeln!(uart0, "RXE: {e:?}");
385385
}
386386
}
387387

rp2040-hal/src/i2c.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,8 @@ impl core::fmt::Debug for Error {
142142
match self {
143143
Error::InvalidReadBufferLength => write!(fmt, "InvalidReadBufferLength"),
144144
Error::InvalidWriteBufferLength => write!(fmt, "InvalidWriteBufferLength"),
145-
Error::AddressOutOfRange(addr) => write!(fmt, "AddressOutOfRange({:x})", addr),
146-
Error::AddressReserved(addr) => write!(fmt, "AddressReserved({:x})", addr),
145+
Error::AddressOutOfRange(addr) => write!(fmt, "AddressOutOfRange({addr:x})"),
146+
Error::AddressReserved(addr) => write!(fmt, "AddressReserved({addr:x})"),
147147
Error::Abort(_) => {
148148
write!(fmt, "{:?}", self.kind())
149149
}

rp235x-hal-examples/src/bin/adc_fifo_dma.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ fn main() -> ! {
172172
.unwrap();
173173
}
174174

175-
writeln!(uart, "Sampling took: {}\r", time_taken).unwrap();
175+
writeln!(uart, "Sampling took: {time_taken}\r").unwrap();
176176

177177
loop {
178178
delay.delay_ms(1000);

rp235x-hal-examples/src/bin/adc_fifo_irq.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ mod app {
147147
|done, buf, uart| {
148148
if *done {
149149
for sample in buf {
150-
writeln!(uart, "Sample: {}\r", sample).unwrap();
150+
writeln!(uart, "Sample: {sample}\r").unwrap();
151151
}
152152
writeln!(uart, "All done, going to sleep 😴\r").unwrap();
153153
true

rp235x-hal-examples/src/bin/adc_fifo_poll.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ fn main() -> ! {
177177
.unwrap();
178178
}
179179

180-
writeln!(uart, "Sampling took: {}\r", time_taken).unwrap();
180+
writeln!(uart, "Sampling took: {time_taken}\r").unwrap();
181181

182182
loop {
183183
delay.delay_ms(1000);

rp235x-hal-examples/src/bin/float_test.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ where
267267
)
268268
.unwrap();
269269
let mut acc: T = acc;
270-
writeln!(&GLOBAL_UART, "Start: acc={}, arg={}", acc, arg).unwrap();
270+
writeln!(&GLOBAL_UART, "Start: acc={acc}, arg={arg}").unwrap();
271271

272272
let start_count = dwt.cyccnt.read();
273273
for _ in 0..LOOPS {
@@ -286,7 +286,7 @@ where
286286

287287
#[exception]
288288
unsafe fn HardFault(ef: &cortex_m_rt::ExceptionFrame) -> ! {
289-
let _ = writeln!(&GLOBAL_UART, "HARD FAULT:\n{:#?}", ef);
289+
let _ = writeln!(&GLOBAL_UART, "HARD FAULT:\n{ef:#?}");
290290

291291
hal::reboot::reboot(
292292
hal::reboot::RebootKind::BootSel {
@@ -299,7 +299,7 @@ unsafe fn HardFault(ef: &cortex_m_rt::ExceptionFrame) -> ! {
299299

300300
#[panic_handler]
301301
fn panic(info: &core::panic::PanicInfo) -> ! {
302-
let _ = writeln!(&GLOBAL_UART, "PANIC:\n{:?}", info);
302+
let _ = writeln!(&GLOBAL_UART, "PANIC:\n{info:?}");
303303

304304
hal::reboot::reboot(
305305
hal::reboot::RebootKind::BootSel {

0 commit comments

Comments
 (0)