---

yaml
---
r: 206362
b: refs/heads/beta
c: dd85c42
h: refs/heads/master
v: v3

Author: Nick Hamann

[refs]

@@ -29,7 +29,7 @@ refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
 refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
 refs/heads/batch: b7fd822592a4fb577552d93010c4a4e14f314346
 refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
-refs/heads/beta: 3a4a1e5f386137514b91c76ad06d909789bcd549
+refs/heads/beta: dd85c42ee151a9d350327f3aab7492a178716507
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: 579e31929feff51dcaf8d444648eff8de735f91a

branches/beta/src/libstd/sys/common/net2.rs

@@ -271,11 +271,18 @@ impl FromInner<Socket> for TcpStream {
 
 impl fmt::Debug for TcpStream {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.debug_struct("TcpStream")
-        .field("addr", &self.socket_addr())
-        .field("peer", &self.peer_addr())
-        .field("inner", &self.inner.as_inner())
-        .finish()
+        let mut res = f.debug_struct("TcpStream");
+
+        if let Ok(addr) = self.socket_addr() {
+            res = res.field("addr", &addr);
+        }
+
+        if let Ok(peer) = self.peer_addr() {
+            res = res.field("peer", &peer);
+        }
+
+        res = res.field("inner", &self.inner.as_inner());
+        res.finish()
     }
 }
 
@@ -340,10 +347,14 @@ impl FromInner<Socket> for TcpListener {
 
 impl fmt::Debug for TcpListener {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.debug_struct("TcpListener")
-        .field("addr", &self.socket_addr())
-        .field("inner", &self.inner.as_inner())
-        .finish()
+        let mut res = f.debug_struct("TcpListener");
+
+        if let Ok(addr) = self.socket_addr() {
+            res = res.field("addr", &addr);
+        }
+
+        res = res.field("inner", &self.inner.as_inner());
+        res.finish()
     }
 }
 
@@ -468,9 +479,13 @@ impl FromInner<Socket> for UdpSocket {
 
 impl fmt::Debug for UdpSocket {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.debug_struct("UdpSocket")
-        .field("addr", &self.socket_addr())
-        .field("inner", &self.inner.as_inner())
-        .finish()
+        let mut res = f.debug_struct("UdpSocket");
+
+        if let Ok(addr) = self.socket_addr() {
+            res = res.field("addr", &addr);
+        }
+
+        res = res.field("inner", &self.inner.as_inner());
+        res.finish()
     }
 }