diff --git a/Cargo.toml b/Cargo.toml index 26cd28f..eccf633 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,7 +30,7 @@ multipart = { version = "0.18.0", default-features = false, features = [ ], optional = true } native-tls = { version = "0.2.10", optional = true } rustls-native-certs = { version = "0.8.1", optional = true } -rustls-opt-dep = { package = "rustls", version = "0.23.22", default-features = false, features = [ +rustls = { version = "0.23.22", default-features = false, features = [ "ring", "std", "tls12", @@ -54,7 +54,7 @@ lazy_static = "1.4.0" multipart = { version = "0.18.0", default-features = false, features = [ "server", ] } -rustls-opt-dep = { package = "rustls", version = "0.23.22", default-features = false, features = [ +rustls = { version = "0.23.22", default-features = false, features = [ "ring", "std", "tls12", @@ -86,7 +86,7 @@ rustls = ["tls-rustls-webpki-roots"] tls-rustls = ["tls-rustls-webpki-roots"] tls-vendored = ["tls-native-vendored"] # Internal feature used to indicate rustls support -__rustls = ["rustls-opt-dep"] +__rustls = ["dep:rustls"] [package.metadata.docs.rs] all-features = true diff --git a/src/lib.rs b/src/lib.rs index 6dc0d47..a79faaf 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -60,9 +60,6 @@ //! ``` //! -#[cfg(feature = "__rustls")] -extern crate rustls_opt_dep as rustls; - macro_rules! debug { ($($arg:tt)+) => { log::debug!(target: "attohttpc", $($arg)+) }; } diff --git a/tests/tools/proxy.rs b/tests/tools/proxy.rs index 6dad164..b64188e 100644 --- a/tests/tools/proxy.rs +++ b/tests/tools/proxy.rs @@ -101,7 +101,7 @@ async fn tunnel(upgraded: Upgraded, addr: String) -> std::io::Result<()> { } async fn create_proxy(tls: bool, deny: bool) -> anyhow::Result { - let _ = rustls_opt_dep::crypto::ring::default_provider().install_default(); + let _ = rustls::crypto::ring::default_provider().install_default(); let addr = SocketAddr::from(([127, 0, 0, 1], 0)); let listener = TcpListener::bind(addr).await?; let port = listener.local_addr().unwrap().port();