Improve more Debug representations

Author: dtolnay

src/mapping.rs

@@ -11,7 +11,7 @@ use std::iter::FromIterator;
 use std::mem;
 
 /// A YAML mapping in which the keys and values are both `serde_yaml::Value`.
-#[derive(Clone, Debug, Default, Eq, PartialEq)]
+#[derive(Clone, Default, Eq, PartialEq)]
 pub struct Mapping {
     map: IndexMap<Value, Value>,
 }

src/number.rs

@@ -2,7 +2,7 @@ use crate::Error;
 use serde::de::{Unexpected, Visitor};
 use serde::{forward_to_deserialize_any, Deserialize, Deserializer, Serialize, Serializer};
 use std::cmp::Ordering;
-use std::fmt::{self, Debug, Display};
+use std::fmt::{self, Display};
 use std::hash::{Hash, Hasher};
 
 /// Represents a YAML number, whether integer or floating point.
@@ -14,7 +14,7 @@ pub struct Number {
 // "N" is a prefix of "NegInt"... this is a false positive.
 // https://github.com/Manishearth/rust-clippy/issues/1241
 #[allow(clippy::enum_variant_names)]
-#[derive(Copy, Clone, Debug)]
+#[derive(Copy, Clone)]
 enum N {
     PosInt(u64),
     /// Always less than zero.
@@ -290,7 +290,7 @@ impl Number {
     }
 }
 
-impl fmt::Display for Number {
+impl Display for Number {
     fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
         match self.n {
             N::PosInt(i) => Display::fmt(&i, formatter),
@@ -308,12 +308,6 @@ impl fmt::Display for Number {
     }
 }
 
-impl Debug for Number {
-    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-        Debug::fmt(&self.n, formatter)
-    }
-}
-
 impl PartialEq for N {
     fn eq(&self, other: &N) -> bool {
         match (*self, *other) {

src/value/debug.rs

@@ -1,3 +1,4 @@
+use crate::mapping::Mapping;
 use crate::value::{Number, Value};
 use std::fmt::{self, Debug, Display};
 
@@ -12,26 +13,7 @@ impl Debug for Value {
                 formatter.write_str("Sequence ")?;
                 formatter.debug_list().entries(sequence).finish()
             }
-            Value::Mapping(mapping) => {
-                formatter.write_str("Mapping ")?;
-                let mut debug = formatter.debug_map();
-                for (k, v) in mapping {
-                    let tmp;
-                    debug.entry(
-                        match k {
-                            Value::Bool(boolean) => boolean,
-                            Value::Number(number) => {
-                                tmp = DisplayNumber(number);
-                                &tmp
-                            }
-                            Value::String(string) => string,
-                            _ => k,
-                        },
-                        v,
-                    );
-                }
-                debug.finish()
-            }
+            Value::Mapping(mapping) => Debug::fmt(mapping, formatter),
             Value::Tagged(tagged) => Debug::fmt(tagged, formatter),
         }
     }
@@ -44,3 +26,32 @@ impl<'a> Debug for DisplayNumber<'a> {
         Display::fmt(self.0, formatter)
     }
 }
+
+impl Debug for Number {
+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+        write!(formatter, "Number({})", self)
+    }
+}
+
+impl Debug for Mapping {
+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+        formatter.write_str("Mapping ")?;
+        let mut debug = formatter.debug_map();
+        for (k, v) in self {
+            let tmp;
+            debug.entry(
+                match k {
+                    Value::Bool(boolean) => boolean,
+                    Value::Number(number) => {
+                        tmp = DisplayNumber(number);
+                        &tmp
+                    }
+                    Value::String(string) => string,
+                    _ => k,
+                },
+                v,
+            );
+        }
+        debug.finish()
+    }
+}