Better (shorter, clearer) debug implementation

Fixes #56
BurntSushi · Jun 11, 2020 · 9cddc90 · 9cddc90
1 parent 2122e1e
commit 9cddc90
Showing 1 changed file with 26 additions and 5 deletions.
diff --git a/src/impls.rs b/src/impls.rs
@@ -329,12 +329,24 @@ mod bstr {
         fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
             write!(f, "\"")?;
             for (s, e, ch) in self.char_indices() {
-                if ch == '\u{FFFD}' {
-                    for &b in self[s..e].as_bytes() {
-                        write!(f, r"\x{:X}", b)?;
+                match ch {
+                    '\0' => write!(f, "\\0")?,
+                    '\u{FFFD}' => {
+                        for &b in self[s..e].as_bytes() {
+                            write!(f, r"\x{:02X}", b)?;
+                        }
+                    }
+                    // ASCII control characters except \0, \n, \r, \t
+                    '\x01'..='\x08'
+                    | '\x0b'
+                    | '\x0c'
+                    | '\x0e'..='\x19'
+                    | '\x7f' => {
+                        write!(f, "\\x{:02x}", ch as u32)?;
+                    }
+                    '\n' | '\r' | '\t' | _ => {
+                        write!(f, "{}", ch.escape_debug())?;
                     }
-                } else {
-                    write!(f, "{}", ch.escape_debug())?;
                 }
             }
             write!(f, "\"")?;
@@ -759,3 +771,12 @@ mod bstring_arbitrary {
         }
     }
 }
+
+#[test]
+fn test_debug() {
+    use crate::ByteSlice;
+    assert_eq!(
+        r#""\0\0\0 ftypisom\0\0\x02\0isomiso2avc1mp""#,
+        format!("{:?}", b"\0\0\0 ftypisom\0\0\x02\0isomiso2avc1mp".as_bstr()),
+    );
+}