Update examples to use new Tokio (#316)
The old `tokio-core` crate is deprecated in favour of the `tokio` crate, which also provides the new multithreaded Tokio runtime. Although `h2` is generic over the runtime, the examples do depend on `tokio`. This branch update the example code to use the new `tokio` library rather than `tokio-core`. It also updates the examples in `RustDoc`. For the most part, this was pretty trivial --- simply replacing `handle.spawn(...)` with `tokio::spawn(...)` and `core.run(...)` with `tokio::run(...)`. There were a couple of cases where error and item types from spawned futures had to be mapped to `(), ()`. Alternatively, this could have been avoided by using the single-threaded runtime and calling `block_on` instead to await the value of those futures, but I thought it was better to reduce the amount of tokio-specific code in the examples. Signed-off-by: Eliza Weisman <eliza@buoyant.io>
This commit is contained in:
@@ -3,7 +3,7 @@ extern crate env_logger;
|
||||
extern crate futures;
|
||||
extern crate h2;
|
||||
extern crate http;
|
||||
extern crate tokio_core;
|
||||
extern crate tokio;
|
||||
|
||||
use h2::server;
|
||||
|
||||
@@ -11,20 +11,16 @@ use bytes::*;
|
||||
use futures::*;
|
||||
use http::*;
|
||||
|
||||
use tokio_core::net::TcpListener;
|
||||
use tokio_core::reactor;
|
||||
use tokio::net::TcpListener;
|
||||
|
||||
pub fn main() {
|
||||
let _ = env_logger::try_init();
|
||||
|
||||
let mut core = reactor::Core::new().unwrap();
|
||||
let handle = core.handle();
|
||||
|
||||
let listener = TcpListener::bind(&"127.0.0.1:5928".parse().unwrap(), &handle).unwrap();
|
||||
let listener = TcpListener::bind(&"127.0.0.1:5928".parse().unwrap()).unwrap();
|
||||
|
||||
println!("listening on {:?}", listener.local_addr());
|
||||
|
||||
let server = listener.incoming().for_each(move |(socket, _)| {
|
||||
let server = listener.incoming().for_each(move |socket| {
|
||||
// let socket = io_dump::Dump::to_stdout(socket);
|
||||
|
||||
let connection = server::handshake(socket)
|
||||
@@ -64,9 +60,10 @@ pub fn main() {
|
||||
Ok(())
|
||||
});
|
||||
|
||||
handle.spawn(connection);
|
||||
tokio::spawn(Box::new(connection));
|
||||
Ok(())
|
||||
});
|
||||
})
|
||||
.map_err(|e| eprintln!("accept error: {}", e));
|
||||
|
||||
core.run(server).unwrap();
|
||||
tokio::run(server);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user