diff --git a/compiler/rustc_mir_transform/src/pass_manager.rs b/compiler/rustc_mir_transform/src/pass_manager.rs
index cf88e8b2144d8..2380391d09a91 100644
--- a/compiler/rustc_mir_transform/src/pass_manager.rs
+++ b/compiler/rustc_mir_transform/src/pass_manager.rs
@@ -78,7 +78,7 @@ pub fn run_passes<'tcx>(tcx: TyCtxt<'tcx>, body: &mut Body<'tcx>, passes: &[&dyn
 
     let validate = tcx.sess.opts.debugging_opts.validate_mir;
     let overridden_passes = &tcx.sess.opts.debugging_opts.mir_enable_passes;
-    trace!("Overridden: {:?}", overridden_passes);
+    trace!(?overridden_passes);
 
     if validate {
         validate_body(tcx, body, format!("start of phase transition from {:?}", start_phase));
@@ -89,9 +89,9 @@ pub fn run_passes<'tcx>(tcx: TyCtxt<'tcx>, body: &mut Body<'tcx>, passes: &[&dyn
 
         if let Some((_, polarity)) = overridden_passes.iter().rev().find(|(s, _)| s == &*name) {
             trace!(
-                "{} {} as requested by flag",
+                pass = %name,
+                "{} as requested by flag",
                 if *polarity { "Running" } else { "Not running" },
-                name
             );
             if !polarity {
                 continue;
diff --git a/compiler/rustc_session/src/options.rs b/compiler/rustc_session/src/options.rs
index a5c1c713bfc81..0b7ab293fcfbc 100644
--- a/compiler/rustc_session/src/options.rs
+++ b/compiler/rustc_session/src/options.rs
@@ -536,11 +536,8 @@ mod parse {
         match v {
             Some(s) => {
                 for s in s.split(",") {
-                    match s.chars().next() {
-                        Some('+') => slot.push((s[1..].to_string(), true)),
-                        Some('-') => slot.push((s[1..].to_string(), false)),
-                        _ => return false,
-                    }
+                    let Some(pass_name) = s.strip_prefix(&['+', '-'][..]) else { return false };
+                    slot.push((pass_name.to_string(), &s[..1] == "+"));
                 }
                 true
             }