Skip to content

Commit 5b63404

Browse files
author
Nick Hamann
committed
---
yaml --- r: 216554 b: refs/heads/stable c: 91f9dd4 h: refs/heads/master v: v3
1 parent a493a1d commit 5b63404

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@ refs/heads/tmp: 378a370ff2057afeb1eae86eb6e78c476866a4a6
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
3030
refs/tags/homu-tmp: a5286998df566e736b32f6795bfc3803bdaf453d
3131
refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
32-
refs/heads/stable: dd85c42ee151a9d350327f3aab7492a178716507
32+
refs/heads/stable: 91f9dd468fe3248d215620db00ecc739e67ae964
3333
refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375

branches/stable/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)