actix/actix-net
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-net synced 2025-01-31 11:32:10 +01:00
Code Issues Releases Wiki Activity

upgrade derive_more

Browse Source
This commit is contained in:
Nikolay Kim 2019-11-25 17:54:47 +06:00
parent 5265714f68
commit 905d058454
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actix-connect/Cargo.toml
View File

@ -37,7 +37,7 @@ actix-service = "1.0.0-alpha.1"
actix-codec = "0.2.0-alpha.1" actix-codec = "0.2.0-alpha.1"
actix-utils = "0.5.0-alpha.1" actix-utils = "0.5.0-alpha.1"
actix-rt = "1.0.0-alpha.1" actix-rt = "1.0.0-alpha.1"
derive_more = "0.15" derive_more = "0.99"
either = "1.5.2" either = "1.5.2"
futures = "0.3.1" futures = "0.3.1"
http = { version = "0.1.17", optional = true } http = { version = "0.1.17", optional = true }

2
actix-threadpool/Cargo.toml
View File

@ -18,7 +18,7 @@ name = "actix_threadpool"
path = "src/lib.rs" path = "src/lib.rs"
[dependencies] [dependencies]
derive_more = "0.15" derive_more = "0.99"
futures = "0.3.1" futures = "0.3.1"
parking_lot = "0.9" parking_lot = "0.9"
lazy_static = "1.2" lazy_static = "1.2"

9
actix-utils/src/order.rs
View File

@ -8,7 +8,7 @@ use std::rc::Rc;
use std::task::{Context, Poll}; use std::task::{Context, Poll};
use actix_service::{IntoService, Service, Transform}; use actix_service::{IntoService, Service, Transform};
use futures::future::{ok, ready, FutureExt, Ready}; use futures::future::{ok, Ready};
use crate::oneshot; use crate::oneshot;
use crate::task::LocalWaker; use crate::task::LocalWaker;
@ -173,11 +173,12 @@ where
self.acks.push_back(Record { rx: rx1, tx: tx2 }); self.acks.push_back(Record { rx: rx1, tx: tx2 });
let task = self.task.clone(); let task = self.task.clone();
tokio_executor::current_thread::spawn(self.service.call(request).then(move |res| { let fut = self.service.call(request);
tokio_executor::current_thread::spawn(async move {
let res = fut.await;
task.wake(); task.wake();
let _ = tx1.send(res); let _ = tx1.send(res);
ready(()) });
}));
InOrderServiceResponse { rx: rx2 } InOrderServiceResponse { rx: rx2 }
} }