rollup merge of #23749: alexcrichton/remove-old-impl-check

[rust.git] / src / libstd / old_io / net / tcp.rs

diff --git a/src/libstd/old_io/net/tcp.rs b/src/libstd/old_io/net/tcp.rs
index d55d9ca11d14cf5391392ef89e5acb3be9c35166..7fc460c16efca2454a61b7e48bb5d606c62741cf 100644 (file)
--- a/src/libstd/old_io/net/tcp.rs
+++ b/src/libstd/old_io/net/tcp.rs
@@ -338,7 +338,7 @@ pub fn socket_name(&mut self) -> IoResult<SocketAddr> {
     }
 }
 
-impl Listener<TcpStream, TcpAcceptor> for TcpListener {
+impl Listener<TcpAcceptor> for TcpListener {
     fn listen(self) -> IoResult<TcpAcceptor> {
         self.inner.listen(128).map(|a| TcpAcceptor { inner: a })
     }
@@ -453,7 +453,8 @@ pub fn close_accept(&mut self) -> IoResult<()> {
     }
 }
 
-impl Acceptor<TcpStream> for TcpAcceptor {
+impl Acceptor for TcpAcceptor {
+    type Connection = TcpStream;
     fn accept(&mut self) -> IoResult<TcpStream> {
         self.inner.accept().map(TcpStream::new)
     }