use serde derive feature instead of serde_derive
This commit is contained in:
Benjamin Fry
parent
0b8771f79f
commit
fbfbebe07a
19
Cargo.lock
generated
19
Cargo.lock
generated
@ -992,8 +992,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
version = "1.0.89"
|
||||
version = "1.0.90"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_derive"
|
||||
@ -1356,7 +1359,7 @@ name = "toml"
|
||||
version = "0.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -1375,7 +1378,7 @@ dependencies = [
|
||||
"rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"ring 0.14.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"rustls 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"tokio 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"trust-dns-https 0.3.2",
|
||||
@ -1489,7 +1492,7 @@ dependencies = [
|
||||
"openssl 0.10.20 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"ring 0.14.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"socket2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"tokio 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@ -1517,8 +1520,7 @@ dependencies = [
|
||||
"lru-cache 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"resolv-conf 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"rustls 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"tokio 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"tokio-executor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@ -1567,8 +1569,7 @@ dependencies = [
|
||||
"rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"rusqlite 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"rustls 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"tokio 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"tokio-executor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@ -1908,7 +1909,7 @@ dependencies = [
|
||||
"checksum security-framework-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3d6696852716b589dff9e886ff83778bb635150168e83afa8ac6b8a78cb82abc"
|
||||
"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
|
||||
"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
|
||||
"checksum serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)" = "92514fb95f900c9b5126e32d020f5c6d40564c27a5ea6d1d7d9f157a96623560"
|
||||
"checksum serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)" = "aa5f7c20820475babd2c077c3ab5f8c77a31c15e16ea38687b4c02d3e48680f4"
|
||||
"checksum serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)" = "bb6eabf4b5914e88e24eea240bb7c9f9a2cbc1bbbe8d961d381975ec3c6b806c"
|
||||
"checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
|
||||
"checksum smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c4488ae950c49d403731982257768f48fada354a5203fe81f9bb6f43ca9002be"
|
||||
|
||||
@ -76,7 +76,7 @@ radix_trie = "0.1.2"
|
||||
rand = "0.6"
|
||||
ring = { version = "0.14", optional = true }
|
||||
rustls = { version = "0.15", optional = true }
|
||||
serde = { version = "1.0", optional = true }
|
||||
serde = { version = "1.0", features = ["derive"], optional = true }
|
||||
tokio = "^0.1.15"
|
||||
tokio-tcp = "^0.1"
|
||||
trust-dns-https = {version = "0.3.0", path = "../https", optional = true }
|
||||
|
||||
@ -50,7 +50,7 @@ dnssec-openssl = ["dnssec", "trust-dns-proto/dnssec-openssl"]
|
||||
dnssec-ring = ["dnssec", "trust-dns-proto/dnssec-ring"]
|
||||
dnssec = []
|
||||
|
||||
serde-config = ["serde", "serde_derive", "trust-dns-proto/serde-config"]
|
||||
serde-config = ["serde", "trust-dns-proto/serde-config"]
|
||||
|
||||
mdns = ["trust-dns-proto/mdns"]
|
||||
|
||||
@ -67,8 +67,7 @@ log = "^0.4.1"
|
||||
lru-cache = "^0.1.2"
|
||||
resolv-conf = { version = "0.6.0", features = ["system"] }
|
||||
rustls = {version = "0.15", optional = true}
|
||||
serde = { version = "1.0", optional = true }
|
||||
serde_derive = { version = "1.0", optional = true }
|
||||
serde = { version = "1.0", features = ["derive"], optional = true }
|
||||
smallvec = "^0.6"
|
||||
tokio = { version = "^0.1.15", optional = true }
|
||||
tokio-executor = "^0.1.7"
|
||||
|
||||
@ -197,8 +197,6 @@ extern crate lru_cache;
|
||||
extern crate resolv_conf;
|
||||
#[cfg(feature = "serde-config")]
|
||||
#[macro_use]
|
||||
extern crate serde_derive;
|
||||
#[cfg(feature = "serde-config")]
|
||||
extern crate serde;
|
||||
extern crate smallvec;
|
||||
#[cfg(any(feature = "tokio", test))]
|
||||
|
||||
@ -88,8 +88,7 @@ openssl = { version = "0.10", features = ["v102", "v110"], optional = true }
|
||||
rand = "0.6"
|
||||
rusqlite = { version = "0.17.0", features = ["bundled"] }
|
||||
rustls = { version = "0.15", optional = true }
|
||||
serde = "1.0.88"
|
||||
serde_derive = "1.0.88"
|
||||
serde = { version = "1.0.88", features = ["derive"] }
|
||||
time = "0.1"
|
||||
tokio = "0.1.15"
|
||||
tokio-executor = "0.1.7"
|
||||
|
||||
@ -38,9 +38,8 @@ extern crate futures;
|
||||
#[macro_use]
|
||||
extern crate log;
|
||||
extern crate rusqlite;
|
||||
extern crate serde;
|
||||
#[macro_use]
|
||||
extern crate serde_derive;
|
||||
extern crate serde;
|
||||
#[cfg(feature = "dns-over-https")]
|
||||
extern crate h2;
|
||||
#[cfg(feature = "dns-over-https")]
|
||||
|
||||
Loading…
Reference in New Issue
Block a user