refactor(test_runner): use bool::then_some in more places

Author: yvt

src/r3_test_runner/src/driverinterface.rs

@@ -344,11 +344,11 @@ impl TestDriver {
                         .iter()
                         .map(|f| format!("--features={f}")),
                 )
-                .args(if test_run.cpu_lock_by_basepri {
-                    Some("--features=cpu-lock-by-basepri")
-                } else {
-                    None
-                })
+                .args(
+                    test_run
+                        .cpu_lock_by_basepri
+                        .then_some("--features=cpu-lock-by-basepri"),
+                )
                 .arg(match log_level {
                     LogLevel::Off => "--features=log/max_level_off",
                     LogLevel::Error => "--features=log/max_level_error",
@@ -357,8 +357,7 @@ impl TestDriver {
                     LogLevel::Debug => "--features=log/max_level_debug",
                     LogLevel::Trace => "--features=log/max_level_trace",
                 })
-                .args(if verbose { None } else { Some("-q") })
-                // TODO: Use `bool::then` in other places
+                .args((!verbose).then_some("-q"))
                 .args(build_std.then_some("-Zbuild-std=core"))
                 .args(small_rt.then_some("-Zbuild-std-features=panic_immediate_abort"))
                 .env("R3_TEST_DRIVER_LINK_SEARCH", link_dir.path())

src/r3_test_runner/src/targets.rs

@@ -473,7 +473,7 @@ impl Arch {
                 d: true,
             } => Some(BuildOpt::from_target_triple("riscv64gc-unknown-none-elf")),
 
-            Self::Riscv {
+            &Self::Riscv {
                 xlen,
                 e,
                 m,
@@ -487,12 +487,12 @@ impl Arch {
                     Xlen::_64 => "riscv64imac-unknown-none-elf",
                 })
                 .with_target_features(&[
-                    if *e { Some("+e") } else { None },
-                    if *m { None } else { Some("-m") },
-                    if *a { None } else { Some("-a") },
-                    if *c { None } else { Some("-c") },
-                    if *f { Some("+f") } else { None },
-                    if *d { Some("+d") } else { None },
+                    e.then_some("+e"),
+                    (!m).then_some("-m"),
+                    (!a).then_some("-a"),
+                    (!c).then_some("-c"),
+                    f.then_some("+f"),
+                    d.then_some("+d"),
                 ]),
             ),
         }