diff --git a/Cargo.toml b/Cargo.toml index 6a48a791..f489c5c3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,5 +22,6 @@ actix-server = { path = "actix-server" } actix-server-config = { path = "actix-server-config" } actix-service = { path = "actix-service" } actix-testing = { path = "actix-testing" } +actix-threadpool = { path = "actix-threadpool" } actix-utils = { path = "actix-utils" } actix-router = { path = "router" } diff --git a/actix-rt/Cargo.toml b/actix-rt/Cargo.toml index db3782ab..2130afaa 100644 --- a/actix-rt/Cargo.toml +++ b/actix-rt/Cargo.toml @@ -18,7 +18,7 @@ name = "actix_rt" path = "src/lib.rs" [dependencies] -actix-threadpool = "0.1.1" +actix-threadpool = "0.2" futures = "0.3.1" # TODO: Replace this with dependency on tokio-runtime once it is ready diff --git a/actix-rt/src/arbiter.rs b/actix-rt/src/arbiter.rs index f85dcc96..dc3d0fdc 100644 --- a/actix-rt/src/arbiter.rs +++ b/actix-rt/src/arbiter.rs @@ -4,11 +4,11 @@ use std::collections::HashMap; use std::sync::atomic::{AtomicUsize, Ordering}; use std::{fmt, thread}; use std::pin::Pin; -use std::task::Context; +use std::task::{Context, Poll}; use futures::channel::mpsc::{unbounded, UnboundedReceiver, UnboundedSender}; use futures::channel::oneshot::{channel, Canceled, Sender}; -use futures::{future, Future, Poll, FutureExt, Stream}; +use futures::{future, Future, FutureExt, Stream}; use tokio::runtime::current_thread::spawn; use crate::builder::Builder;