From e6f5c622ab6385badb9c45c129c37a742e1b94bb Mon Sep 17 00:00:00 2001
From: Richo Healey <richo@stripe.com>
Date: Mon, 3 Dec 2018 19:51:29 -0800
Subject: More idiomatic Debug impl

---
 spake2/src/lib.rs | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/spake2/src/lib.rs b/spake2/src/lib.rs
index 07fb4df..08e0057 100644
--- a/spake2/src/lib.rs
+++ b/spake2/src/lib.rs
@@ -820,15 +820,13 @@ fn maybe_utf8(s: &[u8]) -> String {
 }
 
 impl<G: Group> fmt::Debug for SPAKE2<G> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(
-            f,
-            "SPAKE2(G=?, side={:?}, idA={}, idB={}, idS={})",
-            self.side,
-            maybe_utf8(&self.id_a),
-            maybe_utf8(&self.id_b),
-            maybe_utf8(&self.id_s)
-        )
+    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+        fmt.debug_struct("SPAKE2")
+            .field("side", &self.side)
+            .field("idA", &maybe_utf8(&self.id_a))
+            .field("idB", &maybe_utf8(&self.id_b))
+            .field("idS", &maybe_utf8(&self.id_s))
+            .finish()
     }
 }
 
-- 
cgit v1.2.3