---

yaml
---
r: 210250
b: refs/heads/try
c: dd85c42
h: refs/heads/master
v: v3

Author: Nick Hamann

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 3e561f05c00cd180ec02db4ccab2840a4aba93d2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: ba0e1cd8147d452c356aacb29fb87568ca26f111
-refs/heads/try: 3a4a1e5f386137514b91c76ad06d909789bcd549
+refs/heads/try: dd85c42ee151a9d350327f3aab7492a178716507
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/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()
     }
 }