---

yaml
---
r: 206363
b: refs/heads/beta
c: 91f9dd4
h: refs/heads/master
i:
  206361: a8d2877
  206359: ecb2093
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: dd85c42ee151a9d350327f3aab7492a178716507
+refs/heads/beta: 91f9dd468fe3248d215620db00ecc739e67ae964
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: 579e31929feff51dcaf8d444648eff8de735f91a

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