From 05b04bba3926e667c8428a3e87d06c5ce805c78f Mon Sep 17 00:00:00 2001
From: Andreas Fackler <AndreasFackler@gmx.de>
Date: Mon, 3 Sep 2018 11:58:54 +0200
Subject: [PATCH] Use Formatter debug helpers.

---
 src/broadcast/broadcast.rs |  6 +++---
 src/fmt.rs                 |  2 +-
 src/sync_key_gen.rs        | 12 ++++++++----
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/broadcast/broadcast.rs b/src/broadcast/broadcast.rs
index 244993c..edef0b5 100644
--- a/src/broadcast/broadcast.rs
+++ b/src/broadcast/broadcast.rs
@@ -50,9 +50,9 @@ impl rand::Rand for Message {
 impl Debug for Message {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match *self {
-            Message::Value(ref v) => write!(f, "Value({:?})", HexProof(&v)),
-            Message::Echo(ref v) => write!(f, "Echo({:?})", HexProof(&v)),
-            Message::Ready(ref bytes) => write!(f, "Ready({:?})", HexBytes(bytes)),
+            Message::Value(ref v) => f.debug_tuple("Value").field(&HexProof(v)).finish(),
+            Message::Echo(ref v) => f.debug_tuple("Echo").field(&HexProof(v)).finish(),
+            Message::Ready(ref b) => f.debug_tuple("Ready").field(&HexBytes(b)).finish(),
         }
     }
 }
diff --git a/src/fmt.rs b/src/fmt.rs
index 05c1ff6..8fa8dc9 100644
--- a/src/fmt.rs
+++ b/src/fmt.rs
@@ -30,7 +30,7 @@ pub struct HexList<'a, T: 'a>(pub &'a [T]);
 impl<'a, T: AsRef<[u8]>> fmt::Debug for HexList<'a, T> {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         let v: Vec<_> = self.0.iter().map(|t| HexBytes(t.as_ref())).collect();
-        write!(f, "{:?}", v)
+        v.fmt(f)
     }
 }
 
diff --git a/src/sync_key_gen.rs b/src/sync_key_gen.rs
index 9861640..043c2fb 100644
--- a/src/sync_key_gen.rs
+++ b/src/sync_key_gen.rs
@@ -199,9 +199,10 @@ pub struct Part(BivarCommitment, Vec<Ciphertext>);
 
 impl Debug for Part {
     fn fmt(&self, f: &mut Formatter) -> fmt::Result {
-        let deg = self.0.degree();
-        let len = self.1.len();
-        write!(f, "Part(<degree {}>, <{} rows>)", deg, len)
+        f.debug_tuple("Part")
+            .field(&format!("<degree {}>", self.0.degree()))
+            .field(&format!("<{} rows>", self.1.len()))
+            .finish()
     }
 }
 
@@ -215,7 +216,10 @@ pub struct Ack(u64, Vec<Ciphertext>);
 
 impl Debug for Ack {
     fn fmt(&self, f: &mut Formatter) -> fmt::Result {
-        write!(f, "Ack({}, <{} values>", self.0, self.1.len())
+        f.debug_tuple("Ack")
+            .field(&self.0)
+            .field(&format!("<{} values>", self.1.len()))
+            .finish()
     }
 }