From 351d847e17032a51e85bde4e1205831943bcd82a Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Sat, 9 May 2020 16:30:09 -0700 Subject: [PATCH] Omit a layer of unnecessary nesting from Debug impl --- src/value/mod.rs | 12 ++++++++++-- tests/debug.rs | 22 +++++++++------------- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/src/value/mod.rs b/src/value/mod.rs index 5165af5..bb636bf 100644 --- a/src/value/mod.rs +++ b/src/value/mod.rs @@ -177,8 +177,16 @@ impl Debug for Value { Value::Bool(v) => formatter.debug_tuple("Bool").field(&v).finish(), Value::Number(ref v) => Debug::fmt(v, formatter), Value::String(ref v) => formatter.debug_tuple("String").field(v).finish(), - Value::Array(ref v) => formatter.debug_tuple("Array").field(v).finish(), - Value::Object(ref v) => formatter.debug_tuple("Object").field(v).finish(), + Value::Array(ref v) => { + formatter.write_str("Array(")?; + Debug::fmt(v, formatter)?; + formatter.write_str(")") + } + Value::Object(ref v) => { + formatter.write_str("Object(")?; + Debug::fmt(v, formatter)?; + formatter.write_str(")") + } } } } diff --git a/tests/debug.rs b/tests/debug.rs index b3b60a9..d2d8448 100644 --- a/tests/debug.rs +++ b/tests/debug.rs @@ -50,20 +50,16 @@ fn error() { assert_eq!(format!("{:?}", err), expected); } -const INDENTED_EXPECTED: &str = r#"Object( - { - "array": Array( - [ - Number( - 0, - ), - Number( - 1, - ), - ], +const INDENTED_EXPECTED: &str = r#"Object({ + "array": Array([ + Number( + 0, ), - }, -)"#; + Number( + 1, + ), + ]), +})"#; #[test] fn indented() {