diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2013-10-17 12:13:29 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2013-10-24 14:21:57 -0700 |
| commit | 4ce71eaca34526d0e3ee1ebf0658d2a20d388ef2 (patch) | |
| tree | 440d109c6f23dd446573195828c1ebbf2d261994 /src/libstd/rt/uv | |
| parent | 59d45b8fe793d369ddf600cce0f212f9b6165a30 (diff) | |
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/uv')
| -rw-r--r-- | src/libstd/rt/uv/uvio.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libstd/rt/uv/uvio.rs b/src/libstd/rt/uv/uvio.rs index 3858b64915a..322588973ae 100644 --- a/src/libstd/rt/uv/uvio.rs +++ b/src/libstd/rt/uv/uvio.rs @@ -493,12 +493,12 @@ impl IoFactory for UvIoFactory { return result_cell.take(); } - fn tcp_bind(&mut self, addr: SocketAddr) -> Result<~RtioTcpListenerObject, IoError> { + fn tcp_bind(&mut self, addr: SocketAddr) -> Result<~RtioTcpListener, IoError> { let mut watcher = TcpWatcher::new(self.uv_loop()); match watcher.bind(addr) { Ok(_) => { let home = get_handle_to_current_scheduler!(); - Ok(~UvTcpListener::new(watcher, home)) + Ok(~UvTcpListener::new(watcher, home) as ~RtioTcpListener) } Err(uverr) => { do task::unkillable { // FIXME(#8674) @@ -804,13 +804,13 @@ impl IoFactory for UvIoFactory { } fn unix_bind(&mut self, path: &CString) -> - Result<~RtioUnixListenerObject, IoError> { + Result<~RtioUnixListener, IoError> { let mut pipe = Pipe::new(self.uv_loop(), false); match pipe.bind(path) { Ok(()) => { let handle = get_handle_to_current_scheduler!(); let pipe = UvUnboundPipe::new(pipe, handle); - Ok(~UvUnixListener::new(pipe)) + Ok(~UvUnixListener::new(pipe) as ~RtioUnixListener) } Err(e) => { let scheduler: ~Scheduler = Local::take(); @@ -919,7 +919,7 @@ impl RtioSocket for UvTcpListener { } impl RtioTcpListener for UvTcpListener { - fn listen(self) -> Result<~RtioTcpAcceptor, IoError> { + fn listen(~self) -> Result<~RtioTcpAcceptor, IoError> { do self.home_for_io_consume |self_| { let acceptor = ~UvTcpAcceptor::new(self_); let incoming = Cell::new(acceptor.incoming.clone()); @@ -1717,7 +1717,7 @@ impl UvUnixListener { } impl RtioUnixListener for UvUnixListener { - fn listen(self) -> Result<~RtioUnixAcceptor, IoError> { + fn listen(~self) -> Result<~RtioUnixAcceptor, IoError> { do self.home_for_io_consume |self_| { let acceptor = ~UvUnixAcceptor::new(self_); let incoming = Cell::new(acceptor.incoming.clone()); |
