diff options
author | Alex Crichton <alex@alexcrichton.com> | 2016-09-02 11:07:52 -0700 |
---|---|---|
committer | Alex Crichton <alex@alexcrichton.com> | 2016-09-07 22:12:14 -0700 |
commit | 6c045d31ac78df7b6b190935c2024c90b420da28 (patch) | |
tree | 645a3e9e28959ea09ccd00809f3a226cb842bacd /examples/echo.rs | |
parent | 93c61bb384b8097a4897661eb877fc6a8440a02a (diff) |
Reorganize the entire crate:
Renamed APIs
* Loop => reactor::Core
* LoopHandle => reactor::Handle
* LoopPin => reactor::Pinned
* TcpStream => net::TcpStream
* TcpListener => net::TcpListener
* UdpSocket => net::UdpSocket
* Sender => channel::Sender
* Receiver => channel::Receiver
* Timeout => reactor::Timeout
* ReadinessStream => reactor::PollEvented
* All `LoopHandle` methods to construct objects are now free functions on the
associated types, e.g. `LoopHandle::tcp_listen` is now `TcpListener::bind`
* All APIs taking a `Handle` now take a `Handle` as the last argument
* All future-returning APIs now return concrete types instead of trait objects
Added APIs
* io::Io trait -- Read + Write + ability to poll
Removed without replacement:
* AddSource
* AddTimeout
* IoToken
* TimeoutToken
Closes #3
Closes #6
Diffstat (limited to 'examples/echo.rs')
-rw-r--r-- | examples/echo.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/examples/echo.rs b/examples/echo.rs index 1116d683..4c8417c8 100644 --- a/examples/echo.rs +++ b/examples/echo.rs @@ -9,8 +9,9 @@ use std::net::SocketAddr; use futures::Future; use futures::stream::Stream; -use tokio_core::Loop; use tokio_core::io::{copy, TaskIo}; +use tokio_core::net::TcpListener; +use tokio_core::reactor::Core; fn main() { env_logger::init().unwrap(); @@ -18,11 +19,11 @@ fn main() { let addr = addr.parse::<SocketAddr>().unwrap(); // Create the event loop that will drive this server - let mut l = Loop::new().unwrap(); + let mut l = Core::new().unwrap(); let pin = l.pin(); // Create a TCP listener which will listen for incoming connections - let server = l.handle().tcp_listen(&addr); + let server = TcpListener::bind(&addr, &l.handle()); let done = server.and_then(move |socket| { // Once we've got the TCP listener, inform that we have it |