refactor: slightly reduce use of futures-util (#577)

Author: paolobarbolini

tower-http/Cargo.toml

@@ -90,7 +90,7 @@ auth = ["base64", "validate-request"]
 catch-panic = ["tracing", "futures-util/std", "dep:http-body", "dep:http-body-util"]
 cors = []
 follow-redirect = ["futures-util", "dep:http-body", "iri-string", "tower/util"]
-fs = ["futures-util", "dep:http-body", "dep:http-body-util", "tokio/fs", "tokio-util/io", "tokio/io-util", "dep:http-range-header", "mime_guess", "mime", "percent-encoding", "httpdate", "set-status", "futures-util/alloc", "tracing"]
+fs = ["futures-core", "futures-util", "dep:http-body", "dep:http-body-util", "tokio/fs", "tokio-util/io", "tokio/io-util", "dep:http-range-header", "mime_guess", "mime", "percent-encoding", "httpdate", "set-status", "futures-util/alloc", "tracing"]
 limit = ["dep:http-body", "dep:http-body-util"]
 map-request-body = []
 map-response-body = []

tower-http/src/auth/async_require_authorization.rs

@@ -8,7 +8,7 @@
 //! use tower_http::auth::{AsyncRequireAuthorizationLayer, AsyncAuthorizeRequest};
 //! use http::{Request, Response, StatusCode, header::AUTHORIZATION};
 //! use tower::{Service, ServiceExt, ServiceBuilder, service_fn, BoxError};
-//! use futures_util::future::BoxFuture;
+//! use futures_core::future::BoxFuture;
 //! use bytes::Bytes;
 //! use http_body_util::Full;
 //!
@@ -80,7 +80,7 @@
 //! use tower_http::auth::{AsyncRequireAuthorizationLayer, AsyncAuthorizeRequest};
 //! use http::{Request, Response, StatusCode};
 //! use tower::{Service, ServiceExt, ServiceBuilder, BoxError};
-//! use futures_util::future::BoxFuture;
+//! use futures_core::future::BoxFuture;
 //! use http_body_util::Full;
 //! use bytes::Bytes;
 //!
@@ -312,7 +312,7 @@ mod tests {
     #[allow(unused_imports)]
     use super::*;
     use crate::test_helpers::Body;
-    use futures_util::future::BoxFuture;
+    use futures_core::future::BoxFuture;
     use http::{header, StatusCode};
     use tower::{BoxError, ServiceBuilder, ServiceExt};
 

tower-http/src/services/fs/mod.rs

@@ -1,7 +1,7 @@
 //! File system related services.
 
 use bytes::Bytes;
-use futures_util::Stream;
+use futures_core::Stream;
 use http_body::{Body, Frame};
 use pin_project_lite::pin_project;
 use std::{

tower-http/src/services/fs/serve_dir/future.rs

@@ -6,7 +6,8 @@ use crate::{
     body::UnsyncBoxBody, content_encoding::Encoding, services::fs::AsyncReadBody, BoxError,
 };
 use bytes::Bytes;
-use futures_util::future::{BoxFuture, FutureExt, TryFutureExt};
+use futures_core::future::BoxFuture;
+use futures_util::future::{FutureExt, TryFutureExt};
 use http::{
     header::{self, ALLOW},
     HeaderValue, Request, Response, StatusCode,

tower-http/src/test_helpers.rs

@@ -128,7 +128,6 @@ pub(crate) async fn to_bytes<T>(body: T) -> Result<Bytes, T::Error>
 where
     T: http_body::Body,
 {
-    futures_util::pin_mut!(body);
     Ok(body.collect().await?.to_bytes())
 }