berkus
/
actix-web
mirror of https://github.com/fafhrd91/actix-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove usage of async keyword in code

This commit is contained in:
Douman 2019-01-15 04:41:34 -05:00
parent 3431fff4d7
commit 235bb7b033
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -61,7 +61,7 @@ flate2-rust = ["flate2/rust_backend"]
cell = ["actix-net/cell"] cell = ["actix-net/cell"]
[dependencies] [dependencies]
actix = "0.7.9" actix = "0.7.10"
actix-net = "0.2.6" actix-net = "0.2.6"
v_htmlescape = "0.3.2" v_htmlescape = "0.3.2"

10
src/client/connector.rs
View File

@ -953,7 +953,7 @@ impl Handler<Connect> for ClientConnector {
if self.paused.is_paused() { if self.paused.is_paused() {
let rx = self.wait_for(key.clone(), wait_timeout, conn_timeout); let rx = self.wait_for(key.clone(), wait_timeout, conn_timeout);
self.stats.waits += 1; self.stats.waits += 1;
return ActorResponse::async( return ActorResponse::future(
rx.map_err(|_| ClientConnectorError::Disconnected) rx.map_err(|_| ClientConnectorError::Disconnected)
.into_actor(self) .into_actor(self)
.and_then(move |res, act, ctx| match res { .and_then(move |res, act, ctx| match res {
@ -984,7 +984,7 @@ impl Handler<Connect> for ClientConnector {
}; };
self.connect_waiter(&key, waiter, ctx); self.connect_waiter(&key, waiter, ctx);
return ActorResponse::async( return ActorResponse::future(
rx.map_err(|_| ClientConnectorError::Disconnected) rx.map_err(|_| ClientConnectorError::Disconnected)
.into_actor(self) .into_actor(self)
.and_then(move |res, act, ctx| match res { .and_then(move |res, act, ctx| match res {
@ -1005,14 +1005,14 @@ impl Handler<Connect> for ClientConnector {
// use existing connection // use existing connection
conn.pool = Some(AcquiredConn(key, Some(self.acq_tx.clone()))); conn.pool = Some(AcquiredConn(key, Some(self.acq_tx.clone())));
self.stats.reused += 1; self.stats.reused += 1;
ActorResponse::async(fut::ok(conn)) ActorResponse::future(fut::ok(conn))
} }
Acquire::NotAvailable => { Acquire::NotAvailable => {
// connection is not available, wait // connection is not available, wait
let rx = self.wait_for(key.clone(), wait_timeout, conn_timeout); let rx = self.wait_for(key.clone(), wait_timeout, conn_timeout);
self.stats.waits += 1; self.stats.waits += 1;
ActorResponse::async( ActorResponse::future(
rx.map_err(|_| ClientConnectorError::Disconnected) rx.map_err(|_| ClientConnectorError::Disconnected)
.into_actor(self) .into_actor(self)
.and_then(move |res, act, ctx| match res { .and_then(move |res, act, ctx| match res {
@ -1041,7 +1041,7 @@ impl Handler<Connect> for ClientConnector {
}; };
self.connect_waiter(&key, waiter, ctx); self.connect_waiter(&key, waiter, ctx);
ActorResponse::async( ActorResponse::future(
rx.map_err(|_| ClientConnectorError::Disconnected) rx.map_err(|_| ClientConnectorError::Disconnected)
.into_actor(self) .into_actor(self)
.and_then(move |res, act, ctx| match res { .and_then(move |res, act, ctx| match res {

4
src/route.rs
View File

@ -104,7 +104,7 @@ impl<S: 'static> Route<S> {
R: Responder + 'static, R: Responder + 'static,
E: Into<Error> + 'static, E: Into<Error> + 'static,
{ {
self.handler = InnerHandler::async(handler); self.handler = InnerHandler::future(handler);
} }
/// Set handler function, use request extractor for parameters. /// Set handler function, use request extractor for parameters.
@ -306,7 +306,7 @@ impl<S: 'static> InnerHandler<S> {
} }
#[inline] #[inline]
fn async<H, R, F, E>(h: H) -> Self fn future<H, R, F, E>(h: H) -> Self
where where
H: Fn(&HttpRequest<S>) -> F + 'static, H: Fn(&HttpRequest<S>) -> F + 'static,
F: Future<Item = R, Error = E> + 'static, F: Future<Item = R, Error = E> + 'static,