---

yaml
---
r: 210251
b: refs/heads/try
c: 91f9dd4
h: refs/heads/master
i:
  210249: 3dafb3e
  210247: 00748b3
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: dd85c42ee151a9d350327f3aab7492a178716507
+refs/heads/try: 91f9dd468fe3248d215620db00ecc739e67ae964
 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

@@ -281,7 +281,8 @@ impl fmt::Debug for TcpStream {
             res = res.field("peer", &peer);
         }
 
-        res = res.field("inner", &self.inner.as_inner());
+        let name = if cfg!(windows) {"socket"} else {"fd"};
+        res = res.field(name, &self.inner.as_inner());
         res.finish()
     }
 }
@@ -353,7 +354,8 @@ impl fmt::Debug for TcpListener {
             res = res.field("addr", &addr);
         }
 
-        res = res.field("inner", &self.inner.as_inner());
+        let name = if cfg!(windows) {"socket"} else {"fd"};
+        res = res.field(name, &self.inner.as_inner());
         res.finish()
     }
 }
@@ -485,7 +487,8 @@ impl fmt::Debug for UdpSocket {
             res = res.field("addr", &addr);
         }
 
-        res = res.field("inner", &self.inner.as_inner());
+        let name = if cfg!(windows) {"socket"} else {"fd"};
+        res = res.field(name, &self.inner.as_inner());
         res.finish()
     }
 }