From a03d258e9dc854f9cf1dbfdfc6c4505c3a84cddc Mon Sep 17 00:00:00 2001
From: Andreas Fackler <AndreasFackler@gmx.de>
Date: Mon, 3 Sep 2018 11:47:18 +0200
Subject: [PATCH] Use Formatter debug helpers. Hide SecretKeyShares.

Output "..." in the `Debug` implementation of `SecretKeyShare`, to make
it consistent with `SecretKey`.
---
 src/lib.rs  | 18 ++++++++++--------
 src/poly.rs |  7 +++++--
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index abd3da4..95e0afc 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -130,7 +130,7 @@ impl fmt::Debug for PublicKey {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         let uncomp = self.0.into_affine().into_uncompressed();
         let bytes = uncomp.as_ref();
-        write!(f, "PublicKey({:?})", HexBytes(bytes))
+        f.debug_tuple("PublicKey").field(&HexBytes(bytes)).finish()
     }
 }
 
@@ -171,7 +171,9 @@ impl fmt::Debug for PublicKeyShare {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         let uncomp = (self.0).0.into_affine().into_uncompressed();
         let bytes = uncomp.as_ref();
-        write!(f, "PublicKeyShare({:?})", HexBytes(bytes))
+        f.debug_tuple("PublicKeyShare")
+            .field(&HexBytes(bytes))
+            .finish()
     }
 }
 
@@ -208,7 +210,7 @@ impl fmt::Debug for Signature {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         let uncomp = self.0.into_affine().into_uncompressed();
         let bytes = uncomp.as_ref();
-        write!(f, "Signature({:?})", HexBytes(bytes))
+        f.debug_tuple("Signature").field(&HexBytes(bytes)).finish()
     }
 }
 
@@ -238,7 +240,9 @@ impl fmt::Debug for SignatureShare {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         let uncomp = (self.0).0.into_affine().into_uncompressed();
         let bytes = uncomp.as_ref();
-        write!(f, "SignatureShare({:?})", HexBytes(bytes))
+        f.debug_tuple("SignatureShare")
+            .field(&HexBytes(bytes))
+            .finish()
     }
 }
 
@@ -313,7 +317,7 @@ impl Drop for SecretKey {
 /// A debug statement where the secret prime field element is redacted.
 impl fmt::Debug for SecretKey {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "SecretKey(...)")
+        f.debug_tuple("SecretKey").field(&"...").finish()
     }
 }
 
@@ -445,9 +449,7 @@ pub struct SecretKeyShare(SecretKey);
 
 impl fmt::Debug for SecretKeyShare {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        let uncomp = self.0.public_key().0.into_affine().into_uncompressed();
-        let bytes = uncomp.as_ref();
-        write!(f, "SecretKeyShare({:?})", HexBytes(bytes))
+        f.debug_tuple("SecretKeyShare").field(&"...").finish()
     }
 }
 
diff --git a/src/poly.rs b/src/poly.rs
index 49d0608..b11c45a 100644
--- a/src/poly.rs
+++ b/src/poly.rs
@@ -56,7 +56,7 @@ impl Clone for Poly {
 /// A debug statement where the `coeff` vector of prime field elements has been redacted.
 impl Debug for Poly {
     fn fmt(&self, f: &mut Formatter) -> fmt::Result {
-        write!(f, "Poly {{ coeff: ... }}")
+        f.debug_struct("Poly").field("coeff", &"...").finish()
     }
 }
 
@@ -689,7 +689,10 @@ impl Drop for BivarPoly {
 /// A debug statement where the `coeff` vector has been redacted.
 impl Debug for BivarPoly {
     fn fmt(&self, f: &mut Formatter) -> fmt::Result {
-        write!(f, "BivarPoly {{ degree: {}, coeff: ... }}", self.degree)
+        f.debug_struct("BivarPoly")
+            .field("degree", &self.degree)
+            .field("coeff", &"...")
+            .finish()
     }
 }