Update defmt_decoder (#2167)

probe-rs/Cargo.toml

@@ -148,7 +148,7 @@ cargo_toml = { version = "0.17.2", optional = true }
 clap = { version = "4.4", features = ["derive"], optional = true }
 colored = { version = "2.1.0", optional = true }
 crossterm = { version = "<= 0.27.0", optional = true }
-defmt-decoder = { version = "0.3.9", features = ["unstable"], optional = true }
+defmt-decoder = { version = "=0.3.10", features = ["unstable"], optional = true } # pinned because "unstable" has potential for breaking changes
 directories = { version = "5", optional = true }
 dunce = { version = "1.0.4" }
 figment = { version = "0.10", features = [

probe-rs/src/bin/probe-rs/util/rtt.rs

@@ -346,8 +346,7 @@ impl RttActiveChannel {
                                     None,
                                 )
                             };
-                            let s =
-                                formatter.format_to_string(frame, file.as_deref(), line, module);
+                            let s = formatter.format_frame(frame, file.as_deref(), line, module);
                             writeln!(formatted_data, "{s}").expect("Writing to String cannot fail");
                             continue;
                         }
@@ -383,11 +382,16 @@ pub struct RttActiveTarget {
     pub defmt_state: Option<DefmtState>,
 }
 
-#[derive(Debug)]
 pub struct DefmtState {
     table: defmt_decoder::Table,
     locs: Option<defmt_decoder::Locations>,
-    formatter: defmt_decoder::log::Formatter,
+    formatter: defmt_decoder::log::format::Formatter,
+}
+
+impl fmt::Debug for DefmtState {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("DefmtState").finish()
+    }
 }
 
 impl RttActiveTarget {
@@ -471,7 +475,8 @@ impl RttActiveTarget {
                     (false, true) => "{t} {L} {s}",
                     (false, false) => "{L} {s}",
                 });
-                let formatter = defmt_decoder::log::Formatter::new(format);
+                let format = defmt_decoder::log::format::FormatterConfig::custom(format);
+                let formatter = defmt_decoder::log::format::Formatter::new(format);
 
                 let locs = {
                     let locs = table.get_locations(&elf)?;