about summary refs log tree commit diff
path: root/src/libstd/sys
diff options
context:
space:
mode:
authorNick Hamann <nick@wabbo.org>2015-05-03 17:31:26 -0500
committerNick Hamann <nick@wabbo.org>2015-05-03 17:31:26 -0500
commit91f9dd468fe3248d215620db00ecc739e67ae964 (patch)
tree34ced2f204b952d68bb55b649b32b18843c4f869 /src/libstd/sys
parentdd85c42ee151a9d350327f3aab7492a178716507 (diff)
downloadrust-91f9dd468fe3248d215620db00ecc739e67ae964.tar.gz
rust-91f9dd468fe3248d215620db00ecc739e67ae964.zip
Change 'inner' field name to 'fd'/'socket' on Unix/Windows in Debug impls
Diffstat (limited to 'src/libstd/sys')
-rw-r--r--src/libstd/sys/common/net2.rs9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/libstd/sys/common/net2.rs b/src/libstd/sys/common/net2.rs
index 688d0edcff1..7da7071670a 100644
--- a/src/libstd/sys/common/net2.rs
+++ b/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()
     }
 }