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

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

View File

@@ -31,6 +31,7 @@ tokio-executor = "0.1.4" # a minimum version so trust-dns-resolver compiles
tokio-io = "0.1"
tokio-threadpool = "0.1.8" # a minimum version so tokio compiles
tokio-timer = "0.2.6" # a minimum version so trust-dns-resolver compiles
trust-dns-resolver = { version = "0.10", optional = true }
url = "1.2"
uuid = { version = "0.7", features = ["v4"] }
hyper-rustls = { version = "0.15", optional = true }
@@ -38,12 +39,10 @@ tokio-rustls = { version = "0.8", optional = true }
webpki-roots = { version = "0.15", optional = true }
rustls = { version = "0.14", features = ["dangerous_configuration"], optional = true }
[target.'cfg(not(any(target_os = "android", windows)))'.dependencies]
trust-dns-resolver = "0.10"
[dev-dependencies]
env_logger = "0.6"
serde_derive = "1.0"
tokio-tcp = "0.1"
[features]
default = ["default-tls"]
@@ -55,6 +54,8 @@ default-tls-vendored = ["default-tls", "native-tls/vendored"]
rustls-tls = ["hyper-rustls", "tokio-rustls", "webpki-roots", "rustls", "tls"]
trust-dns = ["trust-dns-resolver"]
hyper-011 = ["hyper-old-types"]
[package.metadata.docs.rs]