Make Debug format more compact for some types

Avoid vertical alignment

Author: sebastiencs

mina-p2p-messages/src/bigint.rs

@@ -1,10 +1,16 @@
 use serde::{Deserialize, Serialize};
 
-#[derive(
-    Clone, Debug, Default, PartialEq, Eq, PartialOrd, Ord, derive_more::From, derive_more::Into,
-)]
+#[derive(Clone, Default, PartialEq, Eq, PartialOrd, Ord, derive_more::From, derive_more::Into)]
 pub struct BigInt(Box<[u8; 32]>);
 
+impl std::fmt::Debug for BigInt {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        let Self(inner) = self;
+        // Avoid vertical alignment
+        f.write_fmt(format_args!("BigInt({:?})", inner))
+    }
+}
+
 impl BigInt {
     #[cfg(feature = "hashing")]
     pub fn one() -> Self {

mina-p2p-messages/src/number.rs

@@ -3,19 +3,18 @@ use std::{fmt::Display, marker::PhantomData, str::FromStr};
 use serde::{de::Visitor, Deserialize, Serialize};
 
 #[derive(
-    Debug,
-    Clone,
-    Copy,
-    Default,
-    PartialEq,
-    Eq,
-    PartialOrd,
-    Ord,
-    derive_more::From,
-    derive_more::Deref,
+    Clone, Copy, Default, PartialEq, Eq, PartialOrd, Ord, derive_more::From, derive_more::Deref,
 )]
 pub struct Number<T>(pub T);
 
+impl<T: std::fmt::Debug> std::fmt::Debug for Number<T> {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        let Self(inner) = self;
+        // Avoid vertical alignment
+        f.write_fmt(format_args!("Number({:?})", inner))
+    }
+}
+
 pub type Int32 = Number<i32>;
 pub type Int64 = Number<i64>;
 pub type Float64 = Number<f64>;

mina-p2p-messages/src/string.rs

@@ -2,9 +2,17 @@ use binprot::Nat0;
 use serde::{de::Visitor, Deserialize, Serialize};
 
 /// String of bytes.
-#[derive(Clone, Debug, Default, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Clone, Default, PartialEq, Eq, PartialOrd, Ord)]
 pub struct ByteString(Vec<u8>);
 
+impl std::fmt::Debug for ByteString {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        let Self(inner) = self;
+        // Avoid vertical alignment
+        f.write_fmt(format_args!("ByteString({:?})", inner))
+    }
+}
+
 impl std::ops::Deref for ByteString {
     type Target = Vec<u8>;
 
@@ -117,9 +125,17 @@ impl binprot::BinProtWrite for ByteString {
 }
 
 /// Human-readable string.
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Clone, PartialEq, Eq, PartialOrd, Ord)]
 pub struct CharString(Vec<u8>);
 
+impl std::fmt::Debug for CharString {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        let Self(inner) = self;
+        // Avoid vertical alignment
+        f.write_fmt(format_args!("CharString({:?})", inner))
+    }
+}
+
 impl CharString {
     pub fn to_string_lossy(&self) -> std::string::String {
         std::string::String::from_utf8_lossy(&self.0).into_owned()

mina-p2p-messages/src/v2/generated.rs

@@ -795,7 +795,7 @@ pub struct NonZeroCurvePointUncompressedStableV1 {
 ///
 /// Gid: `125`
 /// Location: [src/int64.ml:6:6](https://github.com/MinaProtocol/mina/blob/bfd1009/src/int64.ml#L6)
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, BinProtRead, BinProtWrite, Deref)]
+#[derive(Clone, PartialEq, Serialize, Deserialize, BinProtRead, BinProtWrite, Deref)]
 pub struct UnsignedExtendedUInt64Int64ForVersionTagsStableV1(pub crate::number::Int64);
 
 /// **OCaml name**: `Unsigned_extended.UInt32.Stable.V1`
@@ -806,9 +806,7 @@ pub struct UnsignedExtendedUInt64Int64ForVersionTagsStableV1(pub crate::number::
 ///
 /// Gid: `119`
 /// Location: [src/int32.ml:6:6](https://github.com/MinaProtocol/mina/blob/bfd1009/src/int32.ml#L6)
-#[derive(
-    Clone, Debug, PartialEq, Serialize, Deserialize, BinProtRead, BinProtWrite, Deref, Default,
-)]
+#[derive(Clone, PartialEq, Serialize, Deserialize, BinProtRead, BinProtWrite, Deref, Default)]
 pub struct UnsignedExtendedUInt32StableV1(pub crate::number::Int32);
 
 /// **OCaml name**: `Mina_numbers__Nat.Make32.Stable.V1`

mina-p2p-messages/src/v2/manual.rs

@@ -805,4 +805,23 @@ impl From<&PicklesProofProofsVerifiedMaxStableV2> for PicklesProofProofsVerified
     }
 }
 
+impl std::fmt::Debug for super::UnsignedExtendedUInt32StableV1 {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        let Self(inner) = self;
+        // Avoid vertical alignment
+        f.write_fmt(format_args!("UnsignedExtendedUInt32StableV1({:?})", inner))
+    }
+}
+
+impl std::fmt::Debug for super::UnsignedExtendedUInt64Int64ForVersionTagsStableV1 {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        let Self(inner) = self;
+        // Avoid vertical alignment
+        f.write_fmt(format_args!(
+            "UnsignedExtendedUInt64Int64ForVersionTagsStableV1({:?})",
+            inner
+        ))
+    }
+}
+
 pub mod conv;