From 29bd6a1dd57705fc44a40d63327086643de1d2ad Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Sun, 18 Dec 2022 01:34:48 +0000
Subject: [PATCH] fix version requirement for futures_util

---
 actix-files/Cargo.toml                   | 2 +-
 actix-http-test/Cargo.toml               | 2 +-
 actix-http/Cargo.toml                    | 4 ++--
 actix-http/src/h1/dispatcher_tests.rs    | 2 +-
 actix-http/tests/test_openssl.rs         | 2 +-
 actix-http/tests/test_server.rs          | 5 +----
 actix-multipart/Cargo.toml               | 4 ++--
 actix-multipart/src/extractor.rs         | 2 +-
 actix-multipart/src/server.rs            | 2 +-
 actix-test/Cargo.toml                    | 4 ++--
 actix-web-actors/Cargo.toml              | 4 ++--
 actix-web-actors/tests/test_ws.rs        | 2 +-
 actix-web-codegen/Cargo.toml             | 2 +-
 actix-web/Cargo.toml                     | 6 +++---
 actix-web/src/app.rs                     | 2 +-
 actix-web/src/middleware/condition.rs    | 2 +-
 actix-web/src/middleware/err_handlers.rs | 2 +-
 actix-web/src/types/payload.rs           | 2 +-
 actix-web/src/types/readlines.rs         | 2 +-
 awc/Cargo.toml                           | 6 +++---
 awc/src/client/pool.rs                   | 2 +-
 awc/src/lib.rs                           | 2 +-
 awc/src/ws.rs                            | 2 +-
 awc/tests/test_client.rs                 | 2 +-
 24 files changed, 32 insertions(+), 35 deletions(-)

diff --git a/actix-files/Cargo.toml b/actix-files/Cargo.toml
index 018acdfb1..01dc2928a 100644
--- a/actix-files/Cargo.toml
+++ b/actix-files/Cargo.toml
@@ -29,7 +29,7 @@ actix-web = { version = "4", default-features = false }
 bitflags = "1"
 bytes = "1"
 derive_more = "0.99.5"
-futures-core = { version = "0.3.7", default-features = false, features = ["alloc"] }
+futures-core = { version = "0.3.17", default-features = false, features = ["alloc"] }
 http-range = "0.1.4"
 log = "0.4"
 mime = "0.3"
diff --git a/actix-http-test/Cargo.toml b/actix-http-test/Cargo.toml
index 0a9ddf947..86338fb06 100644
--- a/actix-http-test/Cargo.toml
+++ b/actix-http-test/Cargo.toml
@@ -39,7 +39,7 @@ awc = { version = "3", default-features = false }
 
 base64 = "0.13"
 bytes = "1"
-futures-core = { version = "0.3.7", default-features = false }
+futures-core = { version = "0.3.17", default-features = false }
 http = "0.2.5"
 log = "0.4"
 socket2 = "0.4"
diff --git a/actix-http/Cargo.toml b/actix-http/Cargo.toml
index 3ee285c81..9f3977f0f 100644
--- a/actix-http/Cargo.toml
+++ b/actix-http/Cargo.toml
@@ -67,7 +67,7 @@ bytes = "1"
 bytestring = "1"
 derive_more = "0.99.5"
 encoding_rs = "0.8"
-futures-core = { version = "0.3.7", default-features = false, features = ["alloc"] }
+futures-core = { version = "0.3.17", default-features = false, features = ["alloc"] }
 http = "0.2.5"
 httparse = "1.5.1"
 httpdate = "1.0.1"
@@ -107,7 +107,7 @@ actix-web = "4"
 async-stream = "0.3"
 criterion = { version = "0.4", features = ["html_reports"] }
 env_logger = "0.9"
-futures-util = { version = "0.3.7", default-features = false, features = ["alloc"] }
+futures-util = { version = "0.3.17", default-features = false, features = ["alloc"] }
 memchr = "2.4"
 once_cell = "1.9"
 rcgen = "0.9"
diff --git a/actix-http/src/h1/dispatcher_tests.rs b/actix-http/src/h1/dispatcher_tests.rs
index 3eea859bf..d39c5bd69 100644
--- a/actix-http/src/h1/dispatcher_tests.rs
+++ b/actix-http/src/h1/dispatcher_tests.rs
@@ -64,7 +64,7 @@ fn drop_payload_service(
 fn echo_payload_service() -> impl Service<Request, Response = Response<Bytes>, Error = Error> {
     fn_service(|mut req: Request| {
         Box::pin(async move {
-            use futures_util::stream::StreamExt as _;
+            use futures_util::StreamExt as _;
 
             let mut pl = req.take_payload();
             let mut body = BytesMut::new();
diff --git a/actix-http/tests/test_openssl.rs b/actix-http/tests/test_openssl.rs
index b97b2e45b..40dbb6ba4 100644
--- a/actix-http/tests/test_openssl.rs
+++ b/actix-http/tests/test_openssl.rs
@@ -16,7 +16,7 @@ use actix_utils::future::{err, ok, ready};
 use bytes::{Bytes, BytesMut};
 use derive_more::{Display, Error};
 use futures_core::Stream;
-use futures_util::stream::{once, StreamExt as _};
+use futures_util::{stream::once, StreamExt as _};
 use openssl::{
     pkey::PKey,
     ssl::{SslAcceptor, SslMethod},
diff --git a/actix-http/tests/test_server.rs b/actix-http/tests/test_server.rs
index e8d103c96..e70089b1d 100644
--- a/actix-http/tests/test_server.rs
+++ b/actix-http/tests/test_server.rs
@@ -15,10 +15,7 @@ use actix_service::fn_service;
 use actix_utils::future::{err, ok, ready};
 use bytes::Bytes;
 use derive_more::{Display, Error};
-use futures_util::{
-    stream::{once, StreamExt as _},
-    FutureExt as _,
-};
+use futures_util::{stream::once, FutureExt as _, StreamExt as _};
 use regex::Regex;
 
 #[actix_rt::test]
diff --git a/actix-multipart/Cargo.toml b/actix-multipart/Cargo.toml
index 6f631fcf1..3226850db 100644
--- a/actix-multipart/Cargo.toml
+++ b/actix-multipart/Cargo.toml
@@ -19,7 +19,7 @@ actix-web = { version = "4", default-features = false }
 
 bytes = "1"
 derive_more = "0.99.5"
-futures-core = { version = "0.3.7", default-features = false, features = ["alloc"] }
+futures-core = { version = "0.3.17", default-features = false, features = ["alloc"] }
 httparse = "1.3"
 local-waker = "0.1"
 log = "0.4"
@@ -29,6 +29,6 @@ memchr = "2.5"
 [dev-dependencies]
 actix-rt = "2.2"
 actix-http = "3"
-futures-util = { version = "0.3.7", default-features = false, features = ["alloc"] }
+futures-util = { version = "0.3.17", default-features = false, features = ["alloc"] }
 tokio = { version = "1.8.4", features = ["sync"] }
 tokio-stream = "0.1"
diff --git a/actix-multipart/src/extractor.rs b/actix-multipart/src/extractor.rs
index 1ad1f203d..d45c4869c 100644
--- a/actix-multipart/src/extractor.rs
+++ b/actix-multipart/src/extractor.rs
@@ -14,7 +14,7 @@ use crate::server::Multipart;
 /// ```
 /// use actix_web::{web, HttpResponse, Error};
 /// use actix_multipart::Multipart;
-/// use futures_util::stream::StreamExt as _;
+/// use futures_util::StreamExt as _;
 ///
 /// async fn index(mut payload: Multipart) -> Result<HttpResponse, Error> {
 ///     // iterate over multipart stream
diff --git a/actix-multipart/src/server.rs b/actix-multipart/src/server.rs
index 1d0510039..9e0becd5c 100644
--- a/actix-multipart/src/server.rs
+++ b/actix-multipart/src/server.rs
@@ -868,7 +868,7 @@ mod tests {
     use actix_web::test::TestRequest;
     use actix_web::FromRequest;
     use bytes::Bytes;
-    use futures_util::{future::lazy, StreamExt};
+    use futures_util::{future::lazy, StreamExt as _};
     use std::time::Duration;
     use tokio::sync::mpsc;
     use tokio_stream::wrappers::UnboundedReceiverStream;
diff --git a/actix-test/Cargo.toml b/actix-test/Cargo.toml
index eaea15d47..05d12c25a 100644
--- a/actix-test/Cargo.toml
+++ b/actix-test/Cargo.toml
@@ -37,8 +37,8 @@ actix-utils = "3"
 actix-web = { version = "4", default-features = false, features = ["cookies"] }
 awc = { version = "3", default-features = false, features = ["cookies"] }
 
-futures-core = { version = "0.3.7", default-features = false, features = ["std"] }
-futures-util = { version = "0.3.7", default-features = false, features = [] }
+futures-core = { version = "0.3.17", default-features = false, features = ["std"] }
+futures-util = { version = "0.3.17", default-features = false, features = [] }
 log = "0.4"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
diff --git a/actix-web-actors/Cargo.toml b/actix-web-actors/Cargo.toml
index 26b1c09de..633c3c373 100644
--- a/actix-web-actors/Cargo.toml
+++ b/actix-web-actors/Cargo.toml
@@ -21,7 +21,7 @@ actix-web = { version = "4", default-features = false }
 
 bytes = "1"
 bytestring = "1"
-futures-core = { version = "0.3.7", default-features = false }
+futures-core = { version = "0.3.17", default-features = false }
 pin-project-lite = "0.2"
 tokio = { version = "1.13.1", features = ["sync"] }
 tokio-util = { version = "0.7", features = ["codec"] }
@@ -35,4 +35,4 @@ actix-web = { version = "4", features = ["macros"] }
 mime = "0.3"
 
 env_logger = "0.9"
-futures-util = { version = "0.3.7", default-features = false }
+futures-util = { version = "0.3.17", default-features = false }
diff --git a/actix-web-actors/tests/test_ws.rs b/actix-web-actors/tests/test_ws.rs
index a9eb37699..cf12a0052 100644
--- a/actix-web-actors/tests/test_ws.rs
+++ b/actix-web-actors/tests/test_ws.rs
@@ -3,7 +3,7 @@ use actix_http::ws::Codec;
 use actix_web::{web, App, HttpRequest};
 use actix_web_actors::ws;
 use bytes::Bytes;
-use futures_util::{SinkExt, StreamExt};
+use futures_util::{SinkExt as _, StreamExt as _};
 
 struct Ws;
 
diff --git a/actix-web-codegen/Cargo.toml b/actix-web-codegen/Cargo.toml
index 2477364a6..da5577445 100644
--- a/actix-web-codegen/Cargo.toml
+++ b/actix-web-codegen/Cargo.toml
@@ -27,6 +27,6 @@ actix-test = "0.1"
 actix-utils = "3"
 actix-web = "4"
 
-futures-core = { version = "0.3.7", default-features = false, features = ["alloc"] }
+futures-core = { version = "0.3.17", default-features = false, features = ["alloc"] }
 trybuild = "1"
 rustversion = "1"
diff --git a/actix-web/Cargo.toml b/actix-web/Cargo.toml
index 9ace68811..6078d5739 100644
--- a/actix-web/Cargo.toml
+++ b/actix-web/Cargo.toml
@@ -79,8 +79,8 @@ cfg-if = "1"
 cookie = { version = "0.16", features = ["percent-encode"], optional = true }
 derive_more = "0.99.8"
 encoding_rs = "0.8"
-futures-core = { version = "0.3.7", default-features = false }
-futures-util = { version = "0.3.7", default-features = false }
+futures-core = { version = "0.3.17", default-features = false }
+futures-util = { version = "0.3.17", default-features = false }
 http = "0.2.8"
 itoa = "1"
 language-tags = "0.3"
@@ -107,7 +107,7 @@ const-str = "0.4"
 criterion = { version = "0.4", features = ["html_reports"] }
 env_logger = "0.9"
 flate2 = "1.0.13"
-futures-util = { version = "0.3.7", default-features = false, features = ["std"] }
+futures-util = { version = "0.3.17", default-features = false, features = ["std"] }
 rand = "0.8"
 rcgen = "0.9"
 rustls-pemfile = "1"
diff --git a/actix-web/src/app.rs b/actix-web/src/app.rs
index ec37ff8a4..e53ab8080 100644
--- a/actix-web/src/app.rs
+++ b/actix-web/src/app.rs
@@ -5,7 +5,7 @@ use actix_service::{
     apply, apply_fn_factory, boxed, IntoServiceFactory, ServiceFactory, ServiceFactoryExt,
     Transform,
 };
-use futures_util::future::FutureExt as _;
+use futures_util::FutureExt as _;
 
 use crate::{
     app_service::{AppEntry, AppInit, AppRoutingFactory},
diff --git a/actix-web/src/middleware/condition.rs b/actix-web/src/middleware/condition.rs
index 65f25a67c..5e106c11f 100644
--- a/actix-web/src/middleware/condition.rs
+++ b/actix-web/src/middleware/condition.rs
@@ -7,7 +7,7 @@ use std::{
 };
 
 use futures_core::{future::LocalBoxFuture, ready};
-use futures_util::future::FutureExt as _;
+use futures_util::FutureExt as _;
 use pin_project_lite::pin_project;
 
 use crate::{
diff --git a/actix-web/src/middleware/err_handlers.rs b/actix-web/src/middleware/err_handlers.rs
index 3a4e44a2c..4ddbc6318 100644
--- a/actix-web/src/middleware/err_handlers.rs
+++ b/actix-web/src/middleware/err_handlers.rs
@@ -351,7 +351,7 @@ mod tests {
     use actix_service::IntoService;
     use actix_utils::future::ok;
     use bytes::Bytes;
-    use futures_util::future::FutureExt as _;
+    use futures_util::FutureExt as _;
 
     use super::*;
     use crate::{
diff --git a/actix-web/src/types/payload.rs b/actix-web/src/types/payload.rs
index f17a4ed6d..4045cedb4 100644
--- a/actix-web/src/types/payload.rs
+++ b/actix-web/src/types/payload.rs
@@ -27,7 +27,7 @@ use crate::{
 /// # Examples
 /// ```
 /// use std::future::Future;
-/// use futures_util::stream::StreamExt as _;
+/// use futures_util::StreamExt as _;
 /// use actix_web::{post, web};
 ///
 /// // `body: web::Payload` parameter extracts raw payload stream from request
diff --git a/actix-web/src/types/readlines.rs b/actix-web/src/types/readlines.rs
index 8a775a073..e75239968 100644
--- a/actix-web/src/types/readlines.rs
+++ b/actix-web/src/types/readlines.rs
@@ -177,7 +177,7 @@ where
 
 #[cfg(test)]
 mod tests {
-    use futures_util::stream::StreamExt as _;
+    use futures_util::StreamExt as _;
 
     use super::*;
     use crate::test::TestRequest;
diff --git a/awc/Cargo.toml b/awc/Cargo.toml
index b40becfec..cf64eed49 100644
--- a/awc/Cargo.toml
+++ b/awc/Cargo.toml
@@ -67,8 +67,8 @@ base64 = "0.13"
 bytes = "1"
 cfg-if = "1"
 derive_more = "0.99.5"
-futures-core = { version = "0.3.7", default-features = false, features = ["alloc"] }
-futures-util = { version = "0.3.7", default-features = false, features = ["alloc", "sink"] }
+futures-core = { version = "0.3.17", default-features = false, features = ["alloc"] }
+futures-util = { version = "0.3.17", default-features = false, features = ["alloc", "sink"] }
 h2 = "0.3.9"
 http = "0.2.5"
 itoa = "1"
@@ -102,7 +102,7 @@ brotli = "3.3.3"
 const-str = "0.4"
 env_logger = "0.9"
 flate2 = "1.0.13"
-futures-util = { version = "0.3.7", default-features = false }
+futures-util = { version = "0.3.17", default-features = false }
 static_assertions = "1.1"
 rcgen = "0.9"
 rustls-pemfile = "1"
diff --git a/awc/src/client/pool.rs b/awc/src/client/pool.rs
index 5655b5845..47c1fdd67 100644
--- a/awc/src/client/pool.rs
+++ b/awc/src/client/pool.rs
@@ -19,7 +19,7 @@ use actix_rt::time::{sleep, Sleep};
 use actix_service::Service;
 use ahash::AHashMap;
 use futures_core::future::LocalBoxFuture;
-use futures_util::FutureExt;
+use futures_util::FutureExt as _;
 use http::uri::Authority;
 use pin_project_lite::pin_project;
 use tokio::sync::{OwnedSemaphorePermit, Semaphore};
diff --git a/awc/src/lib.rs b/awc/src/lib.rs
index 8d6ea759a..412ccbe61 100644
--- a/awc/src/lib.rs
+++ b/awc/src/lib.rs
@@ -83,7 +83,7 @@
 //! ```no_run
 //! # #[actix_rt::main]
 //! # async fn main() -> Result<(), Box<dyn std::error::Error>> {
-//! use futures_util::{sink::SinkExt as _, stream::StreamExt as _};
+//! use futures_util::{SinkExt as _, StreamExt as _};
 //!
 //! let (_resp, mut connection) = awc::Client::new()
 //!     .ws("ws://echo.websocket.org")
diff --git a/awc/src/ws.rs b/awc/src/ws.rs
index b316f68b4..4ef2e2b36 100644
--- a/awc/src/ws.rs
+++ b/awc/src/ws.rs
@@ -6,7 +6,7 @@
 //!
 //! ```no_run
 //! use awc::{Client, ws};
-//! use futures_util::{sink::SinkExt as _, stream::StreamExt as _};
+//! use futures_util::{SinkExt as _, StreamExt as _};
 //!
 //! #[actix_rt::main]
 //! async fn main() {
diff --git a/awc/tests/test_client.rs b/awc/tests/test_client.rs
index c4b468eeb..db987fdfa 100644
--- a/awc/tests/test_client.rs
+++ b/awc/tests/test_client.rs
@@ -139,7 +139,7 @@ async fn timeout_override() {
 
 #[actix_rt::test]
 async fn response_timeout() {
-    use futures_util::stream::{once, StreamExt as _};
+    use futures_util::{stream::once, StreamExt as _};
 
     let srv = actix_test::start(|| {
         App::new().service(web::resource("/").route(web::to(|| async {