forked/reqwest-impersonate
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch trust-dns to an off-by-default optional feature

Browse Source
This commit is contained in:
Sean McArthur
2019-01-11 16:12:17 -08:00
parent 81b4d26682
commit 4d221533a2
5 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/error.rs
View File

@@ -140,7 +140,7 @@ impl Error {
Kind::NativeTls(ref e) => Some(e),
#[cfg(feature = "rustls-tls")]
Kind::Rustls(ref e) => Some(e),
#[cfg(not(any(target_os = "android", windows)))]
#[cfg(feature = "trust-dns")]
Kind::DnsSystemConf(ref e) => Some(e),
Kind::Io(ref e) => Some(e),
Kind::UrlEncoded(ref e) => Some(e),
@@ -239,7 +239,7 @@ impl fmt::Display for Error {
Kind::NativeTls(ref e) => fmt::Display::fmt(e, f),
#[cfg(feature = "rustls-tls")]
Kind::Rustls(ref e) => fmt::Display::fmt(e, f),
#[cfg(not(any(target_os = "android", windows)))]
#[cfg(feature = "trust-dns")]
Kind::DnsSystemConf(ref e) => {
write!(f, "failed to load DNS system conf: {}", e)
},
@@ -274,7 +274,7 @@ impl StdError for Error {
Kind::NativeTls(ref e) => e.description(),
#[cfg(feature = "rustls-tls")]
Kind::Rustls(ref e) => e.description(),
#[cfg(not(any(target_os = "android", windows)))]
#[cfg(feature = "trust-dns")]
Kind::DnsSystemConf(_) => "failed to load DNS system conf",
Kind::Io(ref e) => e.description(),
Kind::UrlEncoded(ref e) => e.description(),
@@ -299,7 +299,7 @@ impl StdError for Error {
Kind::NativeTls(ref e) => e.cause(),
#[cfg(feature = "rustls-tls")]
Kind::Rustls(ref e) => e.cause(),
#[cfg(not(any(target_os = "android", windows)))]
#[cfg(feature = "trust-dns")]
Kind::DnsSystemConf(ref e) => e.cause(),
Kind::Io(ref e) => e.cause(),
Kind::UrlEncoded(ref e) => e.cause(),
@@ -326,7 +326,7 @@ pub(crate) enum Kind {
NativeTls(::native_tls::Error),
#[cfg(feature = "rustls-tls")]
Rustls(::rustls::TLSError),
#[cfg(not(any(target_os = "android", windows)))]
#[cfg(feature = "trust-dns")]
DnsSystemConf(io::Error),
Io(io::Error),
UrlEncoded(::serde_urlencoded::ser::Error),
@@ -501,7 +501,7 @@ pub(crate) fn url_bad_scheme(url: Url) -> Error {
Error::new(Kind::UrlBadScheme, Some(url))
}
#[cfg(not(any(target_os = "android", windows)))]
#[cfg(feature = "trust-dns")]
pub(crate) fn dns_system_conf(io: io::Error) -> Error {
Error::new(Kind::DnsSystemConf(io), None)
}