Merge pull request #351 from nickelc/deps/webpki

Remove unused `TlsError::Webpki` error variant
pull/354/head
Daniel Abramov 2 years ago committed by GitHub
commit e5efe537b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 7
      Cargo.toml
  2. 4
      src/error.rs

@ -24,7 +24,7 @@ native-tls = ["native-tls-crate"]
native-tls-vendored = ["native-tls", "native-tls-crate/vendored"] native-tls-vendored = ["native-tls", "native-tls-crate/vendored"]
rustls-tls-native-roots = ["__rustls-tls", "rustls-native-certs"] rustls-tls-native-roots = ["__rustls-tls", "rustls-native-certs"]
rustls-tls-webpki-roots = ["__rustls-tls", "webpki-roots"] rustls-tls-webpki-roots = ["__rustls-tls", "webpki-roots"]
__rustls-tls = ["rustls", "webpki"] __rustls-tls = ["rustls"]
[dependencies] [dependencies]
data-encoding = { version = "2", optional = true } data-encoding = { version = "2", optional = true }
@ -52,11 +52,6 @@ version = "0.21.0"
optional = true optional = true
version = "0.6.0" version = "0.6.0"
[dependencies.webpki]
optional = true
version = "0.22"
features = ["std"]
[dependencies.webpki-roots] [dependencies.webpki-roots]
optional = true optional = true
version = "0.23" version = "0.23"

@ -271,10 +271,6 @@ pub enum TlsError {
#[cfg(feature = "__rustls-tls")] #[cfg(feature = "__rustls-tls")]
#[error("rustls error: {0}")] #[error("rustls error: {0}")]
Rustls(#[from] rustls::Error), Rustls(#[from] rustls::Error),
/// Webpki error.
#[cfg(feature = "__rustls-tls")]
#[error("webpki error: {0}")]
Webpki(#[from] webpki::Error),
/// DNS name resolution error. /// DNS name resolution error.
#[cfg(feature = "__rustls-tls")] #[cfg(feature = "__rustls-tls")]
#[error("Invalid DNS name")] #[error("Invalid DNS name")]

Loading…
Cancel
Save