From 00cc5c5a85eba7855b1e5928a0e4d75fbbacfd4e Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Mon, 18 Dec 2017 16:57:19 +0100
Subject: [PATCH] More concerns fixes

---
 rust-multiaddr/src/lib.rs | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/rust-multiaddr/src/lib.rs b/rust-multiaddr/src/lib.rs
index df6b13d2..617556ee 100644
--- a/rust-multiaddr/src/lib.rs
+++ b/rust-multiaddr/src/lib.rs
@@ -23,7 +23,14 @@ pub struct Multiaddr {
     bytes: Vec<u8>,
 }
 
-impl ToString for Multiaddr {
+impl fmt::Debug for Multiaddr {
+    #[inline]
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        self.to_string().fmt(f)
+    }
+}
+
+impl fmt::Display for Multiaddr {
     /// Convert a Multiaddr to a string
     ///
     /// # Examples
@@ -35,19 +42,12 @@ impl ToString for Multiaddr {
     /// assert_eq!(address.to_string(), "/ip4/127.0.0.1/udt");
     /// ```
     ///
-    fn to_string(&self) -> String {
-        let mut out = String::new();
-        for s in self.iter() {
-            out.push_str(&s.to_string());
-        }
-        out
-    }
-}
-
-impl fmt::Debug for Multiaddr {
     #[inline]
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        self.to_string().fmt(f)
+        for s in self.iter() {
+            s.to_string().fmt(f)?;
+        }
+        Ok(())
     }
 }