Set :? type hint to inner fields

Instead of applying the Debug type hint `:?` to all inner fields. * add test to check struct with generic type * update test output
knurling-rs · Mar 26, 2021 · 8d97af4 · 8d97af4
1 parent b9f54f5
commit 8d97af4
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 7 deletions.
diff --git a/firmware/qemu/src/bin/hints_inner.out b/firmware/qemu/src/bin/hints_inner.out
@@ -6,3 +6,5 @@
 0.000005 INFO S2 { s: S1 { x: 0b100, y: 12 }, z: 20 }
 0.000006 INFO S2 { s: S1 { x: 0b100, y: 12 }, z: 0x14 }
 0.000007 INFO S2 { s: S1 { x: 0b100, y: 12 }, z: 0b10100 }
+0.000008 INFO S1 { x: "hi", y: 42 }
+0.000009 INFO S1 { x: "hi", y: 0x2a }
diff --git a/firmware/qemu/src/bin/hints_inner.release.out b/firmware/qemu/src/bin/hints_inner.release.out
@@ -6,3 +6,5 @@
 0.000005 INFO S2 { s: S1 { x: 0b100, y: 12 }, z: 20 }
 0.000006 INFO S2 { s: S1 { x: 0b100, y: 12 }, z: 0x14 }
 0.000007 INFO S2 { s: S1 { x: 0b100, y: 12 }, z: 0b10100 }
+0.000008 INFO S1 { x: "hi", y: 42 }
+0.000009 INFO S1 { x: "hi", y: 0x2a }
diff --git a/firmware/qemu/src/bin/hints_inner.rs b/firmware/qemu/src/bin/hints_inner.rs
@@ -111,6 +111,19 @@ fn main() -> ! {
         );
     }
 
+    {
+        #[derive(defmt::Format)]
+        struct S1<T> {
+            x: T,
+            y: u8,
+        }
+
+        // outputs: "S { x: hi, y: 42 }"
+        defmt::info!("{}", S1 { x: "hi", y: 42 });
+        // outputs: "S { x: hi, y: 0x2a }"
+        defmt::info!("{:x}", S1 { x: "hi", y: 42 });
+    }
+
     loop {
         debug::exit(debug::EXIT_SUCCESS)
     }

diff --git a/firmware/qemu/src/bin/log.out b/firmware/qemu/src/bin/log.out
@@ -111,6 +111,6 @@
 0.000110 INFO b"Hi"
 0.000111 INFO b"Hi"
 0.000112 INFO [45054, 49406]
-0.000113 INFO [Data { name: b"Hi", value: true }]
+0.000113 INFO [Data { name: [72, 105], value: true }]
 0.000114 INFO true true
 0.000115 INFO QEMU test finished!
diff --git a/firmware/qemu/src/bin/log.release.out b/firmware/qemu/src/bin/log.release.out
@@ -109,6 +109,6 @@
 0.000108 INFO b"Hi"
 0.000109 INFO b"Hi"
 0.000110 INFO [45054, 49406]
-0.000111 INFO [Data { name: b"Hi", value: true }]
+0.000111 INFO [Data { name: [72, 105], value: true }]
 0.000112 INFO true true
 0.000113 INFO QEMU test finished!
diff --git a/macros/src/lib.rs b/macros/src/lib.rs
@@ -410,11 +410,7 @@ fn fields(
                         "?".to_string()
                     });
                     if let Some(ident) = f.ident.as_ref() {
-                        if ty == "str" {
-                            core::write!(format, "{}: {{={}:?}}", ident, ty).ok();
-                        } else {
-                            core::write!(format, "{}: {{={}}}", ident, ty).ok();
-                        }
+                        core::write!(format, "{}: {{={}:?}}", ident, ty).ok();
 
                         if ty == "?" {
                             list.push(quote!(f.inner.fmt(#ident, false)));