diff --git a/actix-server/Cargo.toml b/actix-server/Cargo.toml index eef518e6..bf9ee344 100644 --- a/actix-server/Cargo.toml +++ b/actix-server/Cargo.toml @@ -30,7 +30,8 @@ log = "0.4" num_cpus = "1.11" mio = "0.6.19" net2 = "0.2" -futures = "0.3.1" +futures-channel = { version = "0.3.4", default-features = false } +futures-util = { version = "0.3.4", default-features = false, features = ["sink"] } slab = "0.4" # unix domain sockets @@ -40,4 +41,4 @@ mio-uds = { version = "0.6.7" } [dev-dependencies] bytes = "0.5" env_logger = "0.7" -actix-testing = "1.0.0" \ No newline at end of file +actix-testing = "1.0.0" diff --git a/actix-server/src/builder.rs b/actix-server/src/builder.rs index ecc3e4e7..27475cfc 100644 --- a/actix-server/src/builder.rs +++ b/actix-server/src/builder.rs @@ -6,11 +6,11 @@ use std::{io, mem, net}; use actix_rt::net::TcpStream; use actix_rt::time::{delay_until, Instant}; use actix_rt::{spawn, System}; -use futures::channel::mpsc::{unbounded, UnboundedReceiver}; -use futures::channel::oneshot; -use futures::future::ready; -use futures::stream::FuturesUnordered; -use futures::{ready, Future, FutureExt, Stream, StreamExt}; +use futures_channel::mpsc::{unbounded, UnboundedReceiver}; +use futures_channel::oneshot; +use futures_util::future::ready; +use futures_util::stream::FuturesUnordered; +use futures_util::{ready, future::Future, FutureExt, stream::Stream, StreamExt}; use log::{error, info}; use net2::TcpBuilder; diff --git a/actix-server/src/config.rs b/actix-server/src/config.rs index 464635b1..e09a567b 100644 --- a/actix-server/src/config.rs +++ b/actix-server/src/config.rs @@ -4,7 +4,7 @@ use std::{fmt, io, net}; use actix_rt::net::TcpStream; use actix_service as actix; use actix_utils::counter::CounterGuard; -use futures::future::{ok, Future, FutureExt, LocalBoxFuture}; +use futures_util::future::{ok, Future, FutureExt, LocalBoxFuture}; use log::error; use super::builder::bind_addr; diff --git a/actix-server/src/server.rs b/actix-server/src/server.rs index 6ba2547f..b29a9e02 100644 --- a/actix-server/src/server.rs +++ b/actix-server/src/server.rs @@ -3,9 +3,9 @@ use std::io; use std::pin::Pin; use std::task::{Context, Poll}; -use futures::channel::mpsc::UnboundedSender; -use futures::channel::oneshot; -use futures::FutureExt; +use futures_channel::mpsc::UnboundedSender; +use futures_channel::oneshot; +use futures_util::FutureExt; use crate::builder::ServerBuilder; use crate::signals::Signal; diff --git a/actix-server/src/service.rs b/actix-server/src/service.rs index c46126a8..bf429185 100644 --- a/actix-server/src/service.rs +++ b/actix-server/src/service.rs @@ -6,8 +6,8 @@ use std::time::Duration; use actix_rt::spawn; use actix_service::{self as actix, Service, ServiceFactory as ActixServiceFactory}; use actix_utils::counter::CounterGuard; -use futures::future::{err, ok, LocalBoxFuture, Ready}; -use futures::{FutureExt, TryFutureExt}; +use futures_util::future::{err, ok, LocalBoxFuture, Ready}; +use futures_util::{FutureExt, TryFutureExt}; use log::error; use super::Token; diff --git a/actix-server/src/signals.rs b/actix-server/src/signals.rs index db226585..b6339621 100644 --- a/actix-server/src/signals.rs +++ b/actix-server/src/signals.rs @@ -3,7 +3,7 @@ use std::io; use std::pin::Pin; use std::task::{Context, Poll}; -use futures::future::lazy; +use futures_util::future::lazy; use crate::server::Server; diff --git a/actix-server/src/worker.rs b/actix-server/src/worker.rs index f51fd310..820a79bf 100644 --- a/actix-server/src/worker.rs +++ b/actix-server/src/worker.rs @@ -7,10 +7,10 @@ use std::time; use actix_rt::time::{delay_until, Delay, Instant}; use actix_rt::{spawn, Arbiter}; use actix_utils::counter::Counter; -use futures::channel::mpsc::{unbounded, UnboundedReceiver, UnboundedSender}; -use futures::channel::oneshot; -use futures::future::{join_all, LocalBoxFuture, MapOk}; -use futures::{Future, FutureExt, Stream, TryFutureExt}; +use futures_channel::mpsc::{unbounded, UnboundedReceiver, UnboundedSender}; +use futures_channel::oneshot; +use futures_util::future::{join_all, LocalBoxFuture, MapOk}; +use futures_util::{future::Future, FutureExt, stream::Stream, TryFutureExt}; use log::{error, info, trace}; use crate::accept::AcceptNotify; diff --git a/actix-server/tests/test_server.rs b/actix-server/tests/test_server.rs index c5aa70bc..e150f56b 100644 --- a/actix-server/tests/test_server.rs +++ b/actix-server/tests/test_server.rs @@ -4,7 +4,7 @@ use std::{net, thread, time}; use actix_server::Server; use actix_service::fn_service; -use futures::future::{lazy, ok}; +use futures_util::future::{lazy, ok}; use net2::TcpBuilder; fn unused_addr() -> net::SocketAddr { @@ -71,7 +71,7 @@ fn test_start() { use actix_codec::{BytesCodec, Framed}; use actix_rt::net::TcpStream; use bytes::Bytes; - use futures::SinkExt; + use futures_util::sink::SinkExt; use std::io::Read; let addr = unused_addr();