feat(client/legacy): HttpConnector is feature flagged

Cargo.toml

@@ -65,6 +65,7 @@ default = []
 full = [
     "client",
     "client-legacy",
+    "client-legacy-http-connector",
     "client-pool",
     "client-proxy",
     "client-proxy-system",
@@ -79,7 +80,8 @@ full = [
 ]
 
 client = ["hyper/client", "dep:tracing", "dep:futures-channel", "dep:tower-service"]
-client-legacy = ["client", "tokio/net", "dep:socket2", "tokio/sync", "dep:libc", "dep:futures-util", "dep:httparse", "dep:sync_wrapper"]
+client-legacy = ["client", "tokio/sync", "dep:futures-util", "dep:httparse", "dep:sync_wrapper"]
+client-legacy-http-connector = ["dep:libc", "dep:socket2", "tokio/net"]
 client-pool = ["client", "dep:futures-util", "dep:tower-layer", "tokio/sync"]
 client-proxy = ["client", "dep:base64", "dep:ipnet", "dep:percent-encoding"]
 client-proxy-system = ["dep:system-configuration", "dep:windows-registry"]

justfile

@@ -1,7 +1,7 @@
 check-client-features:
     cargo hack --no-dev-deps check --feature-powerset --depth 2 \
       --features=client \
-      --include-features client-legacy,client-pool,client-proxy,client-proxy-system,http1,http2,tokio,tracing
+      --include-features client-legacy,client-legacy-http-connector,client-pool,client-proxy,client-proxy-system,http1,http2,tokio,tracing
 
 check-server-features:
     cargo hack --no-dev-deps check --feature-powerset --depth 2 \

src/client/legacy/client.rs

@@ -20,7 +20,7 @@ use hyper::{Method, Request, Response, Uri, Version, body::Body};
 use sync_wrapper::SyncWrapper;
 use tracing::{debug, trace, warn};
 
-#[cfg(feature = "tokio")]
+#[cfg(all(feature = "client-legacy-http-connector", feature = "tokio"))]
 use super::connect::HttpConnector;
 use super::connect::capture::CaptureConnectionExtension;
 use super::connect::{Alpn, Connect, Connected, Connection};
@@ -1616,7 +1616,7 @@ impl Builder {
     }
 
     /// Build a client with this configuration and the default `HttpConnector`.
-    #[cfg(feature = "tokio")]
+    #[cfg(all(feature = "client-legacy-http-connector", feature = "tokio"))]
     pub fn build_http<B>(&self) -> Client<HttpConnector, B>
     where
         B: Body + Send,

src/client/legacy/connect/dns.rs

@@ -21,7 +21,7 @@
 //! });
 //! ```
 use std::error::Error;
-use std::net::{Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6, ToSocketAddrs};
+use std::net::{SocketAddr, ToSocketAddrs};
 use std::pin::Pin;
 use std::str::FromStr;
 use std::task::{self, Poll};
@@ -30,6 +30,10 @@ use std::{fmt, io, vec};
 use tokio::task::JoinHandle;
 use tower_service::Service;
 
+#[cfg(feature = "client-legacy-http-connector")]
+use std::net::{Ipv4Addr, Ipv6Addr, SocketAddrV4, SocketAddrV6};
+
+#[cfg(feature = "client-legacy-http-connector")]
 pub(super) use self::sealed::Resolve;
 
 /// A domain name to resolve into IP addresses.
@@ -179,6 +183,7 @@ pub(super) struct SocketAddrs {
     iter: vec::IntoIter<SocketAddr>,
 }
 
+#[cfg(feature = "client-legacy-http-connector")]
 impl SocketAddrs {
     pub(super) fn new(addrs: Vec<SocketAddr>) -> Self {
         SocketAddrs {
@@ -249,6 +254,7 @@ impl Iterator for SocketAddrs {
     }
 }
 
+#[cfg(all(feature = "client-legacy-http-connector"))]
 mod sealed {
     use std::task::{self, Poll};
 
@@ -285,6 +291,7 @@ mod sealed {
     }
 }
 
+#[cfg(feature = "client-legacy-http-connector")]
 pub(super) async fn resolve<R>(resolver: &mut R, name: Name) -> Result<R::Addrs, R::Error>
 where
     R: Resolve,

src/client/legacy/connect/http.rs

@@ -12,7 +12,7 @@ use futures_util::future::Either;
 use http::uri::{Scheme, Uri};
 use pin_project_lite::pin_project;
 use socket2::TcpKeepalive;
-use tokio::net::{TcpSocket, TcpStream};
+use tokio::net::TcpStream;
 use tokio::time::Sleep;
 use tracing::{debug, trace, warn};
 
@@ -941,7 +941,7 @@ fn connect(
     .map_err(ConnectError::m("tcp bind local error"))?;
 
     // Convert the `Socket` to a Tokio `TcpSocket`.
-    let socket = TcpSocket::from_std_stream(socket.into());
+    let socket = tokio::net::TcpSocket::from_std_stream(socket.into());
 
     if config.reuse_address {
         if let Err(e) = socket.set_reuseaddr(true) {

src/client/legacy/connect/mod.rs

@@ -3,7 +3,8 @@
 //! This module contains:
 //!
 //! - A default [`HttpConnector`][] that does DNS resolution and establishes
-//!   connections over TCP.
+//!   connections over TCP. This connector is gated behind the
+//!   `client-legacy-http-connector` feature flag.
 //! - Types to build custom connectors.
 //!
 //! # Connectors
@@ -72,12 +73,12 @@ use std::{
 
 use ::http::Extensions;
 
-#[cfg(feature = "tokio")]
+#[cfg(all(feature = "client-legacy-http-connector", feature = "tokio"))]
 pub use self::http::{HttpConnector, HttpInfo};
 
 #[cfg(feature = "tokio")]
 pub mod dns;
-#[cfg(feature = "tokio")]
+#[cfg(all(feature = "client-legacy-http-connector", feature = "tokio"))]
 mod http;
 
 pub mod proxy;

src/lib.rs

@@ -23,6 +23,8 @@
 //! * `client`: Enable [`client`] interfaces.
 //! * `client-legacy`: Enable the legacy
 //!   [`Client`][crate::client::legacy::Client] implementation.
+//! * `client-legacy-http-connector`: Enable the legacy
+//!   [`HttpConnector`][crate::client::legacy::connect::HttpConnector].
 //! * `client-pool`: Enable [`client::pool`]. This submodule contains
 //!   interfaces for constructing connection pools.
 //! * `client-proxy`: Enable [`client::proxy`].