]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #19334 : alexcrichton/rust/issue-19333, r=aturon
authorbors <bors@rust-lang.org>
Fri, 5 Dec 2014 15:03:18 +0000 (15:03 +0000)
committerbors <bors@rust-lang.org>
Fri, 5 Dec 2014 15:03:18 +0000 (15:03 +0000)
This may have inadvertently switched during the runtime overhaul, so this
switches TcpListener back to using sockets instead of file descriptors. This
also renames a bunch of variables called `fd` to `socket` to clearly show that
it's not a file descriptor.

Closes #19333


Trivial merge