refactor: use named format arguments more often

Especially when there are implicit ones in the same format string.

Author: yvt

examples/basic_wio_terminal/src/main.rs

@@ -500,8 +500,8 @@ fn button_reporter_task_body() {
             if (st ^ new_st) & mask != 0 {
                 let _ = write!(
                     Console,
-                    "{b:?}: {}",
-                    ["UP", "DOWN"][(new_st & mask != 0) as usize]
+                    "{b:?}: {dir}",
+                    dir = ["UP", "DOWN"][(new_st & mask != 0) as usize]
                 );
             }
         }

src/r3_port_arm_m_test_driver/src/board_rp2040.rs

@@ -22,7 +22,7 @@ fn panic(info: &PanicInfo) -> ! {
     // Disable IRQ
     cortex_m::interrupt::disable();
 
-    r3_support_rp2040::sprintln!("{}{info}", mux::BEGIN_MAIN);
+    r3_support_rp2040::sprintln!("{BEGIN_MAIN}{info}", BEGIN_MAIN = mux::BEGIN_MAIN);
 
     enter_poll_loop();
 }
@@ -50,11 +50,11 @@ impl log::Log for Logger {
 
     fn log(&self, record: &log::Record) {
         r3_support_rp2040::sprintln!(
-            "{}[{:5} {}] {}",
-            mux::BEGIN_LOG,
-            record.level(),
-            record.target(),
-            record.args()
+            "{BEGIN_LOG}[{level:5} {target}] {args}",
+            BEGIN_LOG = mux::BEGIN_LOG,
+            level = record.level(),
+            target = record.target(),
+            args = record.args()
         );
     }
 

src/r3_port_arm_m_test_driver/src/logger_rtt.rs

@@ -17,10 +17,10 @@ impl log::Log for Logger {
             if let Some(channel) = &mut *log_channel {
                 writeln!(
                     channel,
-                    "[{:5} {}] {}",
-                    record.level(),
-                    record.target(),
-                    record.args()
+                    "[{level:5} {target}] {args}",
+                    level = record.level(),
+                    target = record.target(),
+                    args = record.args()
                 )
                 .unwrap();
             }

src/r3_port_arm_m_test_driver/src/logger_semihosting.rs

@@ -7,10 +7,10 @@ impl log::Log for Logger {
 
     fn log(&self, record: &log::Record) {
         cortex_m_semihosting::heprintln!(
-            "[{:5} {}] {}",
-            record.level(),
-            record.target(),
-            record.args()
+            "[{level:5} {target}] {args}",
+            level = record.level(),
+            target = record.target(),
+            args = record.args()
         )
         .unwrap();
     }

src/r3_port_arm_m_test_driver/src/main.rs

@@ -47,8 +47,8 @@ macro_rules! instantiate_test {
 
             #[cfg(feature = "board-rp_pico")]
             r3_support_rp2040::sprintln!(
-                "{}!- TEST WAS SUCCESSFUL -!",
-                crate::board_rp2040::mux::BEGIN_MAIN,
+                "{BEGIN_MAIN}!- TEST WAS SUCCESSFUL -!",
+                BEGIN_MAIN = crate::board_rp2040::mux::BEGIN_MAIN,
             );
 
             #[cfg(feature = "board-rp_pico")]

src/r3_port_arm_test_driver/src/logger_rza1_uart.rs

@@ -9,10 +9,10 @@ impl log::Log for Logger {
 
     fn log(&self, record: &log::Record) {
         r3_support_rza1::sprintln!(
-            "[{:5} {}] {}",
-            record.level(),
-            record.target(),
-            record.args()
+            "[{level:5} {target}] {args}",
+            level = record.level(),
+            target = record.target(),
+            args = record.args()
         );
     }
 

src/r3_port_arm_test_driver/src/logger_semihosting.rs

@@ -7,10 +7,10 @@ impl log::Log for Logger {
 
     fn log(&self, record: &log::Record) {
         arm_semihosting::heprintln!(
-            "[{:5} {}] {}",
-            record.level(),
-            record.target(),
-            record.args()
+            "[{level:5} {target}] {args}",
+            level = record.level(),
+            target = record.target(),
+            args = record.args()
         )
         .unwrap();
     }

src/r3_port_riscv_test_driver/src/logger_rtt.rs

@@ -17,10 +17,10 @@ impl log::Log for Logger {
             if let Some(channel) = &mut *log_channel {
                 writeln!(
                     channel,
-                    "[{:5} {}] {}",
-                    record.level(),
-                    record.target(),
-                    record.args()
+                    "[{level:5} {target}] {args}",
+                    level = record.level(),
+                    target = record.target(),
+                    args = record.args()
                 )
                 .unwrap();
             }

src/r3_port_riscv_test_driver/src/logger_uart.rs

@@ -7,10 +7,10 @@ impl log::Log for Logger {
 
     fn log(&self, record: &log::Record) {
         crate::uart::stderr_write_fmt(format_args!(
-            "[{:5} {}] {}\n",
-            record.level(),
-            record.target(),
-            record.args()
+            "[{level:5} {target}] {args}\n",
+            level = record.level(),
+            target = record.target(),
+            args = record.args()
         ));
     }
 

src/r3_test_runner/src/targets/openocd.rs

@@ -121,9 +121,9 @@ impl DebugProbe for GrPeachOpenOcdDebugProbe {
                 format!(
                     "{GR_PEACH_INIT}
                     {GR_PEACH_RESET}
-                    load_image \"{}\"
+                    load_image \"{exe}\"
                     shutdown",
-                    exe.display(),
+                    exe = exe.display(),
                 ),
             )
             .await