Remove the Reactor::run method (#58)

This commit removes the `Reactor::run` method which has previously been used to
execute futures and turn the reactor at the same time. The tests/examples made
heavy usage of this method but they have now all temporarily moved to `wait()`
until the futures dependency is upgraded. In the meantime this'll allow us to
further trim down the `Reactor` APIs to their final state.
This commit is contained in:
Alex Crichton
2017-12-11 21:29:18 -06:00
committed by Carl Lerche
parent 32f2750c2d
commit a577bfc033
23 changed files with 133 additions and 247 deletions
+5 -6
View File
@@ -31,15 +31,15 @@ use std::net::{self, SocketAddr};
use std::thread;
use bytes::BytesMut;
use futures::future;
use futures::future::Executor;
use futures::future;
use futures::sync::mpsc;
use futures::{Stream, Future, Sink};
use futures_cpupool::CpuPool;
use http::{Request, Response, StatusCode};
use http::header::HeaderValue;
use http::{Request, Response, StatusCode};
use tokio::net::TcpStream;
use tokio::reactor::Reactor;
use tokio::reactor::Handle;
use tokio_io::codec::{Encoder, Decoder};
use tokio_io::{AsyncRead};
@@ -70,8 +70,7 @@ fn main() {
}
fn worker(rx: mpsc::UnboundedReceiver<net::TcpStream>) {
let mut core = Reactor::new().unwrap();
let handle = core.handle();
let handle = Handle::default();
let pool = CpuPool::new(1);
@@ -92,7 +91,7 @@ fn worker(rx: mpsc::UnboundedReceiver<net::TcpStream>) {
})).unwrap();
Ok(())
});
core.run(done).unwrap();
done.wait().unwrap();
}
/// "Server logic" is implemented in this function.