Skip to content

Commit 91f9dd4

Browse files
author
Nick Hamann
committed
Change 'inner' field name to 'fd'/'socket' on Unix/Windows in Debug impls
1 parent dd85c42 commit 91f9dd4

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

src/libstd/sys/common/net2.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,8 @@ impl fmt::Debug for TcpStream {
281281
res = res.field("peer", &peer);
282282
}
283283

284-
res = res.field("inner", &self.inner.as_inner());
284+
let name = if cfg!(windows) {"socket"} else {"fd"};
285+
res = res.field(name, &self.inner.as_inner());
285286
res.finish()
286287
}
287288
}
@@ -353,7 +354,8 @@ impl fmt::Debug for TcpListener {
353354
res = res.field("addr", &addr);
354355
}
355356

356-
res = res.field("inner", &self.inner.as_inner());
357+
let name = if cfg!(windows) {"socket"} else {"fd"};
358+
res = res.field(name, &self.inner.as_inner());
357359
res.finish()
358360
}
359361
}
@@ -485,7 +487,8 @@ impl fmt::Debug for UdpSocket {
485487
res = res.field("addr", &addr);
486488
}
487489

488-
res = res.field("inner", &self.inner.as_inner());
490+
let name = if cfg!(windows) {"socket"} else {"fd"};
491+
res = res.field(name, &self.inner.as_inner());
489492
res.finish()
490493
}
491494
}

0 commit comments

Comments
 (0)