From: Ian Jackson Date: Sat, 1 Feb 2025 12:52:00 +0000 (+0000) Subject: Drop our explicit hyper-tls dependency X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=21290b76b0a51cc325f1a797b7316059afb43c14;p=hippotat.git Drop our explicit hyper-tls dependency This is now handled by reqwest. Signed-off-by: Ian Jackson --- diff --git a/Cargo.lock b/Cargo.lock index 0ba34ab..fac459f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -625,7 +625,6 @@ dependencies = [ "http-body 1.0.1", "http-body-util", "hyper 0.14.32", - "hyper-tls 0.5.0", "indenter", "ipnet", "itertools", @@ -807,19 +806,6 @@ dependencies = [ "tower-service", ] -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes", - "hyper 0.14.32", - "native-tls", - "tokio", - "tokio-native-tls", -] - [[package]] name = "hyper-tls" version = "0.6.0" @@ -1371,7 +1357,7 @@ dependencies = [ "http-body-util", "hyper 1.6.0", "hyper-rustls", - "hyper-tls 0.6.0", + "hyper-tls", "hyper-util", "ipnet", "js-sys", diff --git a/Cargo.lock.minimal b/Cargo.lock.minimal index 643bc0a..fa6acbf 100644 --- a/Cargo.lock.minimal +++ b/Cargo.lock.minimal @@ -675,7 +675,6 @@ dependencies = [ "http-body 1.0.1", "http-body-util", "hyper 0.14.7", - "hyper-tls 0.5.0", "indenter", "ipnet", "itertools", @@ -855,19 +854,6 @@ dependencies = [ "tower-service", ] -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes 1.0.0", - "hyper 0.14.7", - "native-tls", - "tokio", - "tokio-native-tls", -] - [[package]] name = "hyper-tls" version = "0.6.0" @@ -1437,7 +1423,7 @@ dependencies = [ "http-body-util", "hyper 1.1.0", "hyper-rustls", - "hyper-tls 0.6.0", + "hyper-tls", "hyper-util", "ipnet", "js-sys", diff --git a/Cargo.toml b/Cargo.toml index 11e2be9..88b97d8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -43,7 +43,6 @@ fehler = "1" futures = "0.3" heck = ">=0.4, <0.6" hyper = { version = "0.14.7", features = ["full"] } -hyper-tls = "0.5" indenter = "0.3" ipnet = "2.3" itertools = ">=0.10.1, <0.15" diff --git a/debian/control b/debian/control index d665a61..1294e6a 100644 --- a/debian/control +++ b/debian/control @@ -26,7 +26,6 @@ Build-Depends: debhelper (>= 12), librust-http-body-dev (>= 1.0.1~) , librust-http-body-util-dev (>= 0.1.2~) , librust-hyper-dev (>= 0.14.7~) , - librust-hyper-tls-dev (>= 0.5~) , librust-indenter-dev (>= 0.3~) , librust-ipnet-dev (>= 2.3~) , librust-itertools-dev (>= 0.10.1~) , diff --git a/src/prelude.rs b/src/prelude.rs index a0d5a93..d1574ee 100644 --- a/src/prelude.rs +++ b/src/prelude.rs @@ -34,7 +34,6 @@ pub use fehler::{throw, throws}; pub use futures::{poll, future, FutureExt, StreamExt, TryStreamExt}; pub use hyper::body::{Bytes, Buf, HttpBody}; pub use hyper::{Method}; -pub use hyper_tls::HttpsConnector; pub use ipnet::IpNet; pub use itertools::{iproduct, izip, Itertools}; pub use lazy_regex::{regex_captures, regex_is_match, regex_replace_all};