From 7fc4e076c1aa26d71324b953e05710b3e0dbfe2d Mon Sep 17 00:00:00 2001
From: "James Z.M. Gao" <gaozm55@gmail.com>
Date: Wed, 12 Mar 2025 18:43:21 +0800
Subject: [PATCH] remove `BaseClientBuild::client`, expose `ExtraMiddleware`
 (#12133)

close #12127

as discussed in #12127 remove unused BaseClientBuild::client field, and
make base_client::ExtraMiddleware public.
---
 crates/uv-client/src/base_client.rs     | 8 --------
 crates/uv-client/src/lib.rs             | 2 +-
 crates/uv-client/src/registry_client.rs | 8 +-------
 3 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/crates/uv-client/src/base_client.rs b/crates/uv-client/src/base_client.rs
index ca4393964..1421e95d1 100644
--- a/crates/uv-client/src/base_client.rs
+++ b/crates/uv-client/src/base_client.rs
@@ -50,7 +50,6 @@ pub struct BaseClientBuilder<'a> {
     native_tls: bool,
     retries: u32,
     pub connectivity: Connectivity,
-    client: Option<Client>,
     markers: Option<&'a MarkerEnvironment>,
     platform: Option<&'a Platform>,
     auth_integration: AuthIntegration,
@@ -85,7 +84,6 @@ impl BaseClientBuilder<'_> {
             native_tls: false,
             connectivity: Connectivity::Online,
             retries: DEFAULT_RETRIES,
-            client: None,
             markers: None,
             platform: None,
             auth_integration: AuthIntegration::default(),
@@ -127,12 +125,6 @@ impl<'a> BaseClientBuilder<'a> {
         self
     }
 
-    #[must_use]
-    pub fn client(mut self, client: Client) -> Self {
-        self.client = Some(client);
-        self
-    }
-
     #[must_use]
     pub fn markers(mut self, markers: &'a MarkerEnvironment) -> Self {
         self.markers = Some(markers);
diff --git a/crates/uv-client/src/lib.rs b/crates/uv-client/src/lib.rs
index 54b7e9fa7..2f5ce771c 100644
--- a/crates/uv-client/src/lib.rs
+++ b/crates/uv-client/src/lib.rs
@@ -1,5 +1,5 @@
 pub use base_client::{
-    is_extended_transient_error, AuthIntegration, BaseClient, BaseClientBuilder,
+    is_extended_transient_error, AuthIntegration, BaseClient, BaseClientBuilder, ExtraMiddleware,
     UvRetryableStrategy, DEFAULT_RETRIES,
 };
 pub use cached_client::{CacheControl, CachedClient, CachedClientError, DataWithCachePolicy};
diff --git a/crates/uv-client/src/registry_client.rs b/crates/uv-client/src/registry_client.rs
index 05ce1982e..6f4c927f1 100644
--- a/crates/uv-client/src/registry_client.rs
+++ b/crates/uv-client/src/registry_client.rs
@@ -8,7 +8,7 @@ use async_http_range_reader::AsyncHttpRangeReader;
 use futures::{FutureExt, StreamExt, TryStreamExt};
 use http::HeaderMap;
 use itertools::Either;
-use reqwest::{Client, Response, StatusCode};
+use reqwest::{Response, StatusCode};
 use reqwest_middleware::ClientWithMiddleware;
 use tokio::sync::Semaphore;
 use tracing::{info_span, instrument, trace, warn, Instrument};
@@ -115,12 +115,6 @@ impl<'a> RegistryClientBuilder<'a> {
         self
     }
 
-    #[must_use]
-    pub fn client(mut self, client: Client) -> Self {
-        self.base_client_builder = self.base_client_builder.client(client);
-        self
-    }
-
     #[must_use]
     pub fn extra_middleware(mut self, middleware: ExtraMiddleware) -> Self {
         self.base_client_builder = self.base_client_builder.extra_middleware(middleware);