]> git.lizzy.rs Git - rust.git/commitdiff
Change 'inner' field name to 'fd'/'socket' on Unix/Windows in Debug impls
authorNick Hamann <nick@wabbo.org>
Sun, 3 May 2015 22:31:26 +0000 (17:31 -0500)
committerNick Hamann <nick@wabbo.org>
Sun, 3 May 2015 22:31:26 +0000 (17:31 -0500)
src/libstd/sys/common/net2.rs

index 688d0edcff1c7d1fdd59b92b80c14d4339136799..7da7071670ab631c575590df8e6b6dbd95d71a6c 100644 (file)
@@ -281,7 +281,8 @@ fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
             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 @@ fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
             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 @@ fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
             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()
     }
 }