Merge pull request #49 from phip1611/updates

cargo: dependency updates
phip1611 · May 1, 2024 · 2f7729f · 2f7729f
2 parents 0b9605b + 1c06136
commit 2f7729f
Show file tree

Hide file tree

Showing 6 changed files with 78 additions and 77 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Unreleased (Yet)
 
+## ttfb lib
+
+- **BREAKING** The MSRV is now `1.67.0` stable.
+- dependency updates
+
+## ttfb binary
+
+- dependency updates
+
 # v1.11.0 (2024-04-09)
 
 ## ttfb lib

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -7,7 +7,7 @@ absolute timings of DNS lookup, TCP connect, and TLS handshake.
 """
 version = "1.11.0"
 edition = "2021"
-rust-version = "1.65" # MSRV of the library (= min(lib,bin))
+rust-version = "1.67" # MSRV of the library (= min(lib,bin))
 keywords = ["ttfb", "http", "timings", "web"]
 categories = ["network-programming", "command-line-utilities"]
 readme = "README.md"
@@ -38,10 +38,11 @@ bin = ["dep:clap", "dep:crossterm"]
 # +++ LIBRARY +++
 
 # DNS over systems default DNS resolver
-trust-dns-resolver = { version = "0.23.0", features = ["dns-over-rustls"] }
+hickory-resolver = { version = "0.24.0", default-features = false, features = ["dns-over-rustls", "system-config"] }
 # TLS handshake
-rustls = { version = "0.22.0", features = [] }
-rustls-connector = { version = "0.19.0", features = [
+rustls = { version = "0.23.0", default-features = false, features = [ "tls12", "logging", "ring"] }
+# rustls-connector = { version = "0.21.0", features = [
+rustls-connector = { git = "https://github.com/phip1611/rustls-connector", branch = "rustls-fix", features = [
   "rustls-native-certs",
   "webpki-roots",
   "webpki-roots-certs",

diff --git a/src/error.rs b/src/error.rs
@@ -24,11 +24,11 @@ SOFTWARE.
 //! Module for [`TtfbError`].
 
 use derive_more::Display;
+use hickory_resolver::error::{ResolveError, ResolveErrorKind};
 use rustls_connector::HandshakeError;
 use std::error::Error;
 use std::io;
 use std::net::TcpStream;
-use trust_dns_resolver::error::{ResolveError, ResolveErrorKind};
 
 /// Errors during DNS resolving.
 #[derive(Clone, Debug, Display)]

diff --git a/src/lib.rs b/src/lib.rs
@@ -57,6 +57,7 @@ SOFTWARE.
 pub use error::{InvalidUrlError, ResolveDnsError, TtfbError};
 pub use outcome::{DurationPair, TtfbOutcome};
 
+use hickory_resolver::Resolver as DnsResolver;
 use rustls::client::danger::{HandshakeSignatureValid, ServerCertVerified, ServerCertVerifier};
 use rustls::pki_types::{CertificateDer, ServerName, UnixTime};
 use rustls::{ClientConfig, DigitallySignedStruct, Error, SignatureScheme};
@@ -67,7 +68,6 @@ use std::str::FromStr;
 use std::sync::Arc;
 use std::thread;
 use std::time::{Duration, Instant};
-use trust_dns_resolver::Resolver as DnsResolver;
 use url::Url;
 
 mod error;

diff --git a/ttfb-lib-msrv-check/rust-toolchain.toml b/ttfb-lib-msrv-check/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.65.0" # MSRV of the library
+channel = "1.67.0" # MSRV of the library
 profile = "minimal"