0.6.0 - dependency bumps, minor breaking changes that clean up the API

Signed-off-by: kanpov <[email protected]>

Author: kanpov

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "hyper-client-sockets"
-version = "0.5.2"
+version = "0.6.0"
 edition = "2021"
 license = "MIT"
 description = "A Hyper client library allowing access to Unix, VSock and Firecracker sockets"
@@ -19,38 +19,38 @@ hyper = { version = "1.5.2", default-features = false }
 
 # hyper-util support
 tower-service = { version = "0.3.3", optional = true }
-hyper-util = { version = "0.1.9", optional = true, default-features = false }
+hyper-util = { version = "0.1.10", optional = true, default-features = false }
 hex = { version = "0.4.3", optional = true }
-http = { version = "1.1.0", optional = true }
+http = { version = "1.2.0", optional = true }
 # tokio backend
-tokio = { version = "1.40.0", features = ["net", "io-util"], optional = true }
+tokio = { version = "1.43.0", features = ["net", "io-util"], optional = true }
 libc = { version = "0.2.169", optional = true }
 # async-io backend
 async-io = { version = "2.4.0", optional = true }
 smol-hyper = { version = "0.1.1", optional = true, default-features = false, features = [
     "async-io",
 ] }
-futures-lite = { version = "2.5.0", optional = true }
+futures-lite = { version = "2.6.0", optional = true }
 # vsock sockets
 vsock = { version = "0.5.1", optional = true }
 
 [dev-dependencies]
 hyper-client-sockets = { path = ".", features = ["full"] }
 # runtimes
-tokio = { version = "1.38.0", features = ["macros", "fs"] }
+tokio = { version = "1.43.0", features = ["macros", "fs"] }
 async-executor = "1.13.1"
 # hyper utils
-hyper = { version = "1.5", features = ["server", "http1"] }
-hyper-util = { version = "0.1.9", features = [
+hyper = { version = "1.5.2", features = ["server", "http1"] }
+hyper-util = { version = "0.1.10", features = [
     "client",
     "client-legacy",
     "http1",
 ] }
 http-body-util = "0.1.2"
 bytes = "1.9.0"
 # misc
-uuid = { version = "1.11.0", features = ["v4"] }
-tokio-vsock = "0.6.0"
+uuid = { version = "1.12.0", features = ["v4"] }
+tokio-vsock = "0.7.0"
 fastrand = "2.3.0"
 smol-hyper = "0.1.1"
 

Cargo.toml

@@ -7,7 +7,7 @@ use hyper_util::client::legacy::connect::{Connected, Connection};
 
 /// This is an internal wrapper over an IO type that implements [hyper::rt::Write] and
 /// [hyper::rt::Read] that also implements [Connection] to achieve compatibility with hyper-util.
-pub struct ConnectableIo<IO: hyper::rt::Write + hyper::rt::Read + Send + Unpin>(IO);
+pub struct ConnectableIo<IO>(IO);
 
 impl<IO: hyper::rt::Write + hyper::rt::Read + Send + Unpin> hyper::rt::Write for ConnectableIo<IO> {
     #[inline(always)]
@@ -45,7 +45,7 @@ impl<IO: hyper::rt::Write + hyper::rt::Read + Send + Unpin> Connection for Conne
 
 #[cfg(feature = "unix")]
 #[cfg_attr(docsrs, doc(cfg(feature = "unix")))]
-pub mod unix {
+mod unix {
     use std::{future::Future, marker::PhantomData, pin::Pin, task::Poll};
 
     use http::Uri;
@@ -90,9 +90,13 @@ pub mod unix {
     }
 }
 
+#[cfg(feature = "unix")]
+#[cfg_attr(docsrs, doc(cfg(feature = "unix")))]
+pub use unix::UnixConnector;
+
 #[cfg(feature = "vsock")]
 #[cfg_attr(docsrs, doc(cfg(feature = "vsock")))]
-pub mod vsock {
+mod vsock {
     use std::{future::Future, marker::PhantomData, pin::Pin, task::Poll};
 
     use http::Uri;
@@ -137,9 +141,13 @@ pub mod vsock {
     }
 }
 
+#[cfg(feature = "vsock")]
+#[cfg_attr(docsrs, doc(cfg(feature = "vsock")))]
+pub use vsock::VsockConnector;
+
 #[cfg(feature = "firecracker")]
 #[cfg_attr(docsrs, doc(cfg(feature = "firecracker")))]
-pub mod firecracker {
+mod firecracker {
     use std::{future::Future, marker::PhantomData, pin::Pin, task::Poll};
 
     use http::Uri;
@@ -183,3 +191,7 @@ pub mod firecracker {
         }
     }
 }
+
+#[cfg(feature = "firecracker")]
+#[cfg_attr(docsrs, doc(cfg(feature = "firecracker")))]
+pub use firecracker::FirecrackerConnector;

src/connector.rs

@@ -8,7 +8,7 @@ use http_body_util::Full;
 use hyper::client::conn::http1::handshake;
 use hyper_client_sockets::{
     async_io::AsyncIoBackend,
-    connector::{firecracker::FirecrackerConnector, unix::UnixConnector, vsock::VsockConnector},
+    connector::{FirecrackerConnector, UnixConnector, VsockConnector},
     uri::{FirecrackerUri, UnixUri, VsockUri},
     Backend,
 };

tests/async_io.rs

@@ -4,7 +4,7 @@ use http::{Request, Uri};
 use http_body_util::Full;
 use hyper::client::conn::http1::handshake;
 use hyper_client_sockets::{
-    connector::{firecracker::FirecrackerConnector, unix::UnixConnector, vsock::VsockConnector},
+    connector::{FirecrackerConnector, UnixConnector, VsockConnector},
     tokio::TokioBackend,
     uri::{FirecrackerUri, UnixUri, VsockUri},
     Backend,