Don't bake hyper's future into RequestClient::request

Ralith · Ralith · commit 3e7f4fed00ce · 2025-04-27T11:37:34.000-07:00
diff --git a/app/buck2_http/src/client.rs b/app/buck2_http/src/client.rs
@@ -15,6 +15,7 @@ use bytes::Bytes;
 use dupe::Dupe;
 use futures::StreamExt;
 use futures::TryStreamExt;
+use futures::future::BoxFuture;
 use futures::stream::BoxStream;
 use http::Method;
 use http::Uri;
@@ -23,7 +24,6 @@ use http::uri::Scheme;
 use hyper::Body;
 use hyper::Request;
 use hyper::Response;
-use hyper::client::ResponseFuture;
 use hyper::client::connect::Connect;
 use tokio::io::AsyncReadExt;
 use tokio_util::io::StreamReader;
@@ -204,15 +204,17 @@ impl HttpClient {
 /// ProxyConnector<HttpsConnector<..>>, etc); thus wrap the client so we can switch
 /// out the concrete type without exposing implementation details to callers.
 pub(super) trait RequestClient: Send + Sync {
-    fn request(&self, request: Request<Bytes>) -> ResponseFuture;
+    fn request(&self, request: Request<Bytes>) -> ResponseFuture<'_>;
 }
 
+type ResponseFuture<'a> = BoxFuture<'a, hyper::Result<Response<Body>>>;
+
 impl<C> RequestClient for hyper::Client<C>
 where
     C: Connect + Clone + Send + Sync + 'static,
 {
-    fn request(&self, request: Request<Bytes>) -> ResponseFuture {
-        self.request(request.map(Body::from))
+    fn request(&self, request: Request<Bytes>) -> ResponseFuture<'_> {
+        Box::pin(self.request(request.map(Body::from)))
     }
 }
 
