From 9bd640773038431ba8dc8a695a8096c3ad51e530 Mon Sep 17 00:00:00 2001
From: Yuki Okushi <huyuumi.dev@gmail.com>
Date: Mon, 18 May 2020 11:41:31 +0900
Subject: [PATCH] framed: Minimize `futures` dependencies

---
 actix-framed/Cargo.toml           | 2 +-
 actix-framed/src/app.rs           | 2 +-
 actix-framed/src/helpers.rs       | 2 +-
 actix-framed/src/route.rs         | 2 +-
 actix-framed/src/service.rs       | 4 ++--
 actix-framed/tests/test_server.rs | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/actix-framed/Cargo.toml b/actix-framed/Cargo.toml
index 94009db6f..ba7a01e0c 100644
--- a/actix-framed/Cargo.toml
+++ b/actix-framed/Cargo.toml
@@ -26,7 +26,7 @@ actix-rt = "1.0.0"
 actix-http = "2.0.0-alpha.3"
 
 bytes = "0.5.3"
-futures = "0.3.1"
+futures-util = { version = "0.3.5", default-features = false }
 pin-project = "0.4.6"
 log = "0.4"
 
diff --git a/actix-framed/src/app.rs b/actix-framed/src/app.rs
index e4b91e6c4..2fddbc039 100644
--- a/actix-framed/src/app.rs
+++ b/actix-framed/src/app.rs
@@ -8,7 +8,7 @@ use actix_http::h1::{Codec, SendResponse};
 use actix_http::{Error, Request, Response};
 use actix_router::{Path, Router, Url};
 use actix_service::{IntoServiceFactory, Service, ServiceFactory};
-use futures::future::{ok, FutureExt, LocalBoxFuture};
+use futures_util::future::{ok, FutureExt, LocalBoxFuture};
 
 use crate::helpers::{BoxedHttpNewService, BoxedHttpService, HttpNewService};
 use crate::request::FramedRequest;
diff --git a/actix-framed/src/helpers.rs b/actix-framed/src/helpers.rs
index 29492e45b..d83736a52 100644
--- a/actix-framed/src/helpers.rs
+++ b/actix-framed/src/helpers.rs
@@ -2,7 +2,7 @@ use std::task::{Context, Poll};
 
 use actix_http::Error;
 use actix_service::{Service, ServiceFactory};
-use futures::future::{FutureExt, LocalBoxFuture};
+use futures_util::future::{FutureExt, LocalBoxFuture};
 
 pub(crate) type BoxedHttpService<Req> = Box<
     dyn Service<
diff --git a/actix-framed/src/route.rs b/actix-framed/src/route.rs
index 793f46273..7b9004b64 100644
--- a/actix-framed/src/route.rs
+++ b/actix-framed/src/route.rs
@@ -6,7 +6,7 @@ use std::task::{Context, Poll};
 use actix_codec::{AsyncRead, AsyncWrite};
 use actix_http::{http::Method, Error};
 use actix_service::{Service, ServiceFactory};
-use futures::future::{ok, FutureExt, LocalBoxFuture, Ready};
+use futures_util::future::{ok, FutureExt, LocalBoxFuture, Ready};
 use log::error;
 
 use crate::app::HttpServiceFactory;
diff --git a/actix-framed/src/service.rs b/actix-framed/src/service.rs
index 92393ca75..dd61f298d 100644
--- a/actix-framed/src/service.rs
+++ b/actix-framed/src/service.rs
@@ -1,3 +1,4 @@
+use std::future::Future;
 use std::marker::PhantomData;
 use std::pin::Pin;
 use std::task::{Context, Poll};
@@ -9,8 +10,7 @@ use actix_http::h1::{Codec, Message};
 use actix_http::ws::{verify_handshake, HandshakeError};
 use actix_http::{Request, Response};
 use actix_service::{Service, ServiceFactory};
-use futures::future::{err, ok, Either, Ready};
-use futures::Future;
+use futures_util::future::{err, ok, Either, Ready};
 
 /// Service that verifies incoming request if it is valid websocket
 /// upgrade request. In case of error returns `HandshakeError`
diff --git a/actix-framed/tests/test_server.rs b/actix-framed/tests/test_server.rs
index 150fc10f3..ec6897861 100644
--- a/actix-framed/tests/test_server.rs
+++ b/actix-framed/tests/test_server.rs
@@ -4,7 +4,7 @@ use actix_http_test::test_server;
 use actix_service::{pipeline_factory, IntoServiceFactory, ServiceFactory};
 use actix_utils::framed::Dispatcher;
 use bytes::Bytes;
-use futures::{future, SinkExt, StreamExt};
+use futures_util::{future, SinkExt, StreamExt};
 
 use actix_framed::{FramedApp, FramedRequest, FramedRoute, SendError, VerifyWebSockets};