Reduce dependency on futures-util (#3358)

paolobarbolini · web-flow · commit 869ba86e51e1 · 2025-05-25T09:39:35.000+02:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/axum-extra/Cargo.toml b/axum-extra/Cargo.toml
@@ -87,6 +87,7 @@ __private_docs = [
 axum = { path = "../axum", version = "0.8.4", default-features = false, features = ["original-uri"] }
 axum-core = { path = "../axum-core", version = "0.5.2" }
 bytes = "1.1.0"
+futures-core = "0.3"
 futures-util = { version = "0.3", default-features = false, features = ["alloc"] }
 http = "1.0.0"
 http-body = "1.0.0"
diff --git a/axum-extra/src/extract/multipart.rs b/axum-extra/src/extract/multipart.rs
@@ -10,7 +10,7 @@ use axum::{
 };
 use axum_core::__composite_rejection as composite_rejection;
 use axum_core::__define_rejection as define_rejection;
-use futures_util::stream::Stream;
+use futures_core::stream::Stream;
 use http::{
     header::{HeaderMap, CONTENT_TYPE},
     Request, StatusCode,
diff --git a/axum-extra/src/handler/mod.rs b/axum-extra/src/handler/mod.rs
@@ -7,7 +7,8 @@ use axum::{
     handler::Handler,
     response::{IntoResponse, Response},
 };
-use futures_util::future::{BoxFuture, FutureExt, Map};
+use futures_core::future::BoxFuture;
+use futures_util::future::{FutureExt, Map};
 use std::{future::Future, marker::PhantomData};
 
 mod or;
diff --git a/axum-extra/src/handler/or.rs b/axum-extra/src/handler/or.rs
@@ -5,7 +5,8 @@ use axum::{
     handler::Handler,
     response::{IntoResponse, Response},
 };
-use futures_util::future::{BoxFuture, Either as EitherFuture, FutureExt, Map};
+use futures_core::future::BoxFuture;
+use futures_util::future::{Either as EitherFuture, FutureExt, Map};
 use std::{future::Future, marker::PhantomData};
 
 /// [`Handler`] that runs one [`Handler`] and if that rejects it'll fallback to another
diff --git a/axum-extra/src/json_lines.rs b/axum-extra/src/json_lines.rs
@@ -7,7 +7,8 @@ use axum::{
     BoxError,
 };
 use bytes::{BufMut, BytesMut};
-use futures_util::stream::{BoxStream, Stream, TryStream, TryStreamExt};
+use futures_core::{stream::BoxStream, Stream, TryStream};
+use futures_util::stream::TryStreamExt;
 use pin_project_lite::pin_project;
 use serde::{de::DeserializeOwned, Serialize};
 use std::{
@@ -44,7 +45,7 @@ pin_project! {
     /// ```rust
     /// use axum::{BoxError, response::{IntoResponse, Response}};
     /// use axum_extra::json_lines::JsonLines;
-    /// use futures_util::stream::Stream;
+    /// use futures_core::stream::Stream;
     ///
     /// fn stream_of_values() -> impl Stream<Item = Result<serde_json::Value, BoxError>> {
     ///     # futures_util::stream::empty()
diff --git a/axum-extra/src/response/file_stream.rs b/axum-extra/src/response/file_stream.rs
@@ -4,7 +4,7 @@ use axum::{
     BoxError,
 };
 use bytes::Bytes;
-use futures_util::TryStream;
+use futures_core::TryStream;
 use http::{header, StatusCode};
 use std::{io, path::Path};
 use tokio::{
diff --git a/axum/Cargo.toml b/axum/Cargo.toml
@@ -88,6 +88,8 @@ __private = ["tokio", "http1", "dep:reqwest"]
 [dependencies]
 axum-core = { path = "../axum-core", version = "0.5.2" }
 bytes = "1.0"
+futures-core = "0.3"
+futures-sink = "0.3"
 futures-util = { version = "0.3", default-features = false, features = ["alloc"] }
 http = "1.0.0"
 http-body = "1.0.0"
diff --git a/axum/src/docs/middleware.md b/axum/src/docs/middleware.md
@@ -208,7 +208,7 @@ use axum::{
     body::Body,
     extract::Request,
 };
-use futures_util::future::BoxFuture;
+use futures_core::future::BoxFuture;
 use tower::{Service, Layer};
 use std::task::{Context, Poll};
 
diff --git a/axum/src/extract/multipart.rs b/axum/src/extract/multipart.rs
@@ -9,7 +9,7 @@ use axum_core::{
     response::{IntoResponse, Response},
     RequestExt,
 };
-use futures_util::stream::Stream;
+use futures_core::Stream;
 use http::{
     header::{HeaderMap, CONTENT_TYPE},
     StatusCode,
diff --git a/axum/src/extract/ws.rs b/axum/src/extract/ws.rs
@@ -94,10 +94,9 @@ use self::rejection::*;
 use super::FromRequestParts;
 use crate::{body::Bytes, response::Response, Error};
 use axum_core::body::Body;
-use futures_util::{
-    sink::{Sink, SinkExt},
-    stream::{Stream, StreamExt},
-};
+use futures_core::Stream;
+use futures_sink::Sink;
+use futures_util::{sink::SinkExt, stream::StreamExt};
 use http::{
     header::{self, HeaderMap, HeaderName, HeaderValue},
     request::Parts,
diff --git a/axum/src/middleware/from_extractor.rs b/axum/src/middleware/from_extractor.rs
@@ -2,7 +2,7 @@ use crate::{
     extract::FromRequestParts,
     response::{IntoResponse, Response},
 };
-use futures_util::future::BoxFuture;
+use futures_core::future::BoxFuture;
 use http::Request;
 use pin_project_lite::pin_project;
 use std::{
diff --git a/axum/src/middleware/from_fn.rs b/axum/src/middleware/from_fn.rs
@@ -1,5 +1,5 @@
 use axum_core::extract::{FromRequest, FromRequestParts, Request};
-use futures_util::future::BoxFuture;
+use futures_core::future::BoxFuture;
 use std::{
     any::type_name,
     convert::Infallible,
diff --git a/axum/src/middleware/map_request.rs b/axum/src/middleware/map_request.rs
@@ -2,7 +2,7 @@ use crate::body::{Body, Bytes, HttpBody};
 use crate::response::{IntoResponse, Response};
 use crate::BoxError;
 use axum_core::extract::{FromRequest, FromRequestParts};
-use futures_util::future::BoxFuture;
+use futures_core::future::BoxFuture;
 use http::Request;
 use std::{
     any::type_name,
diff --git a/axum/src/middleware/map_response.rs b/axum/src/middleware/map_response.rs
@@ -1,6 +1,6 @@
 use crate::response::{IntoResponse, Response};
 use axum_core::extract::FromRequestParts;
-use futures_util::future::BoxFuture;
+use futures_core::future::BoxFuture;
 use http::Request;
 use std::{
     any::type_name,
diff --git a/axum/src/response/sse.rs b/axum/src/response/sse.rs
@@ -34,7 +34,8 @@ use axum_core::{
     response::{IntoResponse, Response},
 };
 use bytes::{BufMut, BytesMut};
-use futures_util::stream::{Stream, TryStream};
+use futures_core::Stream;
+use futures_util::stream::TryStream;
 use http_body::Frame;
 use pin_project_lite::pin_project;
 use std::{
diff --git a/axum/src/serve/mod.rs b/axum/src/serve/mod.rs
@@ -472,7 +472,7 @@ mod private {
         task::{Context, Poll},
     };
 
-    pub struct ServeFuture(pub(super) futures_util::future::BoxFuture<'static, io::Result<()>>);
+    pub struct ServeFuture(pub(super) futures_core::future::BoxFuture<'static, io::Result<()>>);
 
     impl Future for ServeFuture {
         type Output = io::Result<()>;
diff --git a/axum/src/test_helpers/test_client.rs b/axum/src/test_helpers/test_client.rs
@@ -1,6 +1,6 @@
 use super::{serve, Request, Response};
 use bytes::Bytes;
-use futures_util::future::BoxFuture;
+use futures_core::future::BoxFuture;
 use http::header::{HeaderName, HeaderValue};
 use std::ops::Deref;
 use std::{convert::Infallible, future::IntoFuture, net::SocketAddr};
diff --git a/examples/chat/Cargo.toml b/examples/chat/Cargo.toml
@@ -6,7 +6,7 @@ publish = false
 
 [dependencies]
 axum = { path = "../../axum", features = ["ws"] }
-futures = "0.3"
+futures-util = { version = "0.3", default-features = false, features = ["sink", "std"] }
 tokio = { version = "1", features = ["full"] }
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
diff --git a/examples/chat/src/main.rs b/examples/chat/src/main.rs
@@ -15,7 +15,7 @@ use axum::{
     routing::get,
     Router,
 };
-use futures::{sink::SinkExt, stream::StreamExt};
+use futures_util::{sink::SinkExt, stream::StreamExt};
 use std::{
     collections::HashSet,
     sync::{Arc, Mutex},
diff --git a/examples/low-level-native-tls/src/main.rs b/examples/low-level-native-tls/src/main.rs
@@ -5,7 +5,6 @@
 //! ```
 
 use axum::{extract::Request, routing::get, Router};
-use futures_util::pin_mut;
 use hyper::body::Incoming;
 use hyper_util::rt::{TokioExecutor, TokioIo};
 use std::path::PathBuf;
@@ -43,7 +42,6 @@ async fn main() {
     info!("HTTPS server listening on {bind}. To contact curl -k https://localhost:3000");
     let app = Router::new().route("/", get(handler));
 
-    pin_mut!(tcp_listener);
     loop {
         let tower_service = app.clone();
         let tls_acceptor = tls_acceptor.clone();
diff --git a/examples/low-level-openssl/src/main.rs b/examples/low-level-openssl/src/main.rs
@@ -5,7 +5,6 @@
 //! ```
 
 use axum::{http::Request, routing::get, Router};
-use futures_util::pin_mut;
 use hyper::body::Incoming;
 use hyper_util::rt::{TokioExecutor, TokioIo};
 use openssl::ssl::{Ssl, SslAcceptor, SslFiletype, SslMethod};
@@ -55,8 +54,6 @@ async fn main() {
     info!("HTTPS server listening on {bind}. To contact curl -k https://localhost:3000");
     let app = Router::new().route("/", get(handler));
 
-    pin_mut!(tcp_listener);
-
     loop {
         let tower_service = app.clone();
         let tls_acceptor = tls_acceptor.clone();
diff --git a/examples/low-level-rustls/src/main.rs b/examples/low-level-rustls/src/main.rs
@@ -5,7 +5,6 @@
 //! ```
 
 use axum::{extract::Request, routing::get, Router};
-use futures_util::pin_mut;
 use hyper::body::Incoming;
 use hyper_util::rt::{TokioExecutor, TokioIo};
 use std::{
@@ -47,7 +46,6 @@ async fn main() {
     info!("HTTPS server listening on {bind}. To contact curl -k https://localhost:3000");
     let app = Router::new().route("/", get(handler));
 
-    pin_mut!(tcp_listener);
     loop {
         let tower_service = app.clone();
         let tls_acceptor = tls_acceptor.clone();
diff --git a/examples/sse/Cargo.toml b/examples/sse/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 [dependencies]
 axum = { path = "../../axum" }
 axum-extra = { path = "../../axum-extra", features = ["typed-header"] }
-futures = "0.3"
+futures-util = { version = "0.3", default-features = false, features = ["sink", "std"] }
 headers = "0.4"
 tokio = { version = "1.0", features = ["full"] }
 tokio-stream = "0.1"
diff --git a/examples/sse/src/main.rs b/examples/sse/src/main.rs
@@ -14,7 +14,7 @@ use axum::{
     Router,
 };
 use axum_extra::TypedHeader;
-use futures::stream::{self, Stream};
+use futures_util::stream::{self, Stream};
 use std::{convert::Infallible, path::PathBuf, time::Duration};
 use tokio_stream::StreamExt as _;
 use tower_http::{services::ServeDir, trace::TraceLayer};
diff --git a/examples/stream-to-file/Cargo.toml b/examples/stream-to-file/Cargo.toml
@@ -6,7 +6,7 @@ publish = false
 
 [dependencies]
 axum = { path = "../../axum", features = ["multipart"] }
-futures = "0.3"
+futures-util = { version = "0.3", default-features = false, features = ["sink", "std"] }
 tokio = { version = "1.0", features = ["full"] }
 tokio-util = { version = "0.7", features = ["io"] }
 tracing = "0.1"
diff --git a/examples/stream-to-file/src/main.rs b/examples/stream-to-file/src/main.rs
@@ -12,8 +12,8 @@ use axum::{
     routing::{get, post},
     BoxError, Router,
 };
-use futures::{Stream, TryStreamExt};
-use std::io;
+use futures_util::{Stream, TryStreamExt};
+use std::{io, pin::pin};
 use tokio::{fs::File, io::BufWriter};
 use tokio_util::io::StreamReader;
 use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
@@ -112,8 +112,7 @@ where
     async {
         // Convert the stream into an `AsyncRead`.
         let body_with_io_error = stream.map_err(io::Error::other);
-        let body_reader = StreamReader::new(body_with_io_error);
-        futures::pin_mut!(body_reader);
+        let mut body_reader = pin!(StreamReader::new(body_with_io_error));
 
         // Create the file. `File` implements `AsyncWrite`.
         let path = std::path::Path::new(UPLOADS_DIRECTORY).join(path);
diff --git a/examples/testing-websockets/Cargo.toml b/examples/testing-websockets/Cargo.toml
@@ -6,6 +6,7 @@ publish = false
 
 [dependencies]
 axum = { path = "../../axum", features = ["ws"] }
-futures = "0.3"
+futures-channel = "0.3"
+futures-util = { version = "0.3", default-features = false, features = ["sink", "std"] }
 tokio = { version = "1.0", features = ["full"] }
 tokio-tungstenite = "0.26"
diff --git a/examples/testing-websockets/src/main.rs b/examples/testing-websockets/src/main.rs
diff --git a/examples/websockets/Cargo.toml b/examples/websockets/Cargo.toml
diff --git a/examples/websockets/src/client.rs b/examples/websockets/src/client.rs
diff --git a/examples/websockets/src/main.rs b/examples/websockets/src/main.rs
