summary refs log tree commit diff
path: root/src/libstd/rt/io
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2013-10-17 12:13:29 -0700
committerAlex Crichton <alex@alexcrichton.com>2013-10-24 14:21:57 -0700
commit4ce71eaca34526d0e3ee1ebf0658d2a20d388ef2 (patch)
tree440d109c6f23dd446573195828c1ebbf2d261994 /src/libstd/rt/io
parent59d45b8fe793d369ddf600cce0f212f9b6165a30 (diff)
downloadrust-4ce71eaca34526d0e3ee1ebf0658d2a20d388ef2.tar.gz
rust-4ce71eaca34526d0e3ee1ebf0658d2a20d388ef2.zip
Migrate the last typedefs to ~Trait in rtio
There are no longer any remnants of typedefs, and everything is now built on
true trait objects.
Diffstat (limited to 'src/libstd/rt/io')
-rw-r--r--src/libstd/rt/io/net/tcp.rs4
-rw-r--r--src/libstd/rt/io/net/unix.rs4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/libstd/rt/io/net/tcp.rs b/src/libstd/rt/io/net/tcp.rs
index bafde180d5c..21f98c27296 100644
--- a/src/libstd/rt/io/net/tcp.rs
+++ b/src/libstd/rt/io/net/tcp.rs
@@ -13,7 +13,7 @@ use result::{Ok, Err};
 use rt::io::net::ip::SocketAddr;
 use rt::io::{Reader, Writer, Listener, Acceptor};
 use rt::io::{io_error, read_error, EndOfFile};
-use rt::rtio::{IoFactory, RtioTcpListenerObject, with_local_io,
+use rt::rtio::{IoFactory, with_local_io,
                RtioSocket, RtioTcpListener, RtioTcpAcceptor, RtioTcpStream};
 
 pub struct TcpStream {
@@ -89,7 +89,7 @@ impl Writer for TcpStream {
 }
 
 pub struct TcpListener {
-    priv obj: ~RtioTcpListenerObject
+    priv obj: ~RtioTcpListener
 }
 
 impl TcpListener {
diff --git a/src/libstd/rt/io/net/unix.rs b/src/libstd/rt/io/net/unix.rs
index b98d5b52cb2..fc7839d545f 100644
--- a/src/libstd/rt/io/net/unix.rs
+++ b/src/libstd/rt/io/net/unix.rs
@@ -26,7 +26,7 @@ use prelude::*;
 
 use c_str::ToCStr;
 use rt::rtio::{IoFactory, RtioUnixListener, with_local_io};
-use rt::rtio::{RtioUnixAcceptor, RtioPipe, RtioUnixListenerObject};
+use rt::rtio::{RtioUnixAcceptor, RtioPipe};
 use rt::io::pipe::PipeStream;
 use rt::io::{io_error, Listener, Acceptor, Reader, Writer};
 
@@ -82,7 +82,7 @@ impl Writer for UnixStream {
 }
 
 pub struct UnixListener {
-    priv obj: ~RtioUnixListenerObject,
+    priv obj: ~RtioUnixListener,
 }
 
 impl UnixListener {