Clean up unused dependencies

Cargo.lock

@@ -1810,7 +1810,7 @@ name = "trust-dns"
 version = "0.23.0"
 dependencies = [
  "clap",
- "futures",
+ "futures-util",
  "native-tls",
  "regex",
  "rustls",
@@ -1876,7 +1876,6 @@ dependencies = [
  "tracing-subscriber",
  "trust-dns-client",
  "trust-dns-proto",
- "trust-dns-recursor",
  "trust-dns-resolver",
  "trust-dns-server",
  "webpki-roots",
@@ -1911,7 +1910,6 @@ dependencies = [
  "rustls-native-certs",
  "rustls-pemfile",
  "serde",
- "smallvec",
  "socket2 0.5.3",
  "thiserror",
  "tinyvec",
@@ -1935,14 +1933,12 @@ dependencies = [
  "bytes",
  "cfg-if",
  "enum-as-inner",
- "futures-executor",
  "futures-util",
  "lru-cache",
  "parking_lot",
  "serde",
  "thiserror",
  "tokio",
- "toml",
  "tracing",
  "tracing-subscriber",
  "trust-dns-proto",

bin/Cargo.toml

@@ -70,7 +70,7 @@ path = "src/trust-dns.rs"
 # - derive for clap derive api
 # - help to generate --help
 clap = { workspace = true, default-features = false, features = ["std", "cargo", "help", "derive", "suggestions"] }
-futures = { workspace = true, default-features = false, features = ["std"] }
+futures-util = { workspace = true, default-features = false, features = ["std"] }
 rustls = { workspace = true, optional = true }
 time.workspace = true
 tracing.workspace = true

bin/src/trust-dns.rs

@@ -510,7 +510,7 @@ fn config_tls(
     listen_addrs: &[IpAddr],
     runtime: &mut runtime::Runtime,
 ) {
-    use futures::TryFutureExt;
+    use futures_util::TryFutureExt;
 
     let tls_listen_port: u16 = args
         .tls_port
@@ -563,7 +563,7 @@ fn config_https(
     listen_addrs: &[IpAddr],
     runtime: &mut runtime::Runtime,
 ) {
-    use futures::TryFutureExt;
+    use futures_util::TryFutureExt;
 
     let https_listen_port: u16 = args
         .https_port
@@ -629,7 +629,7 @@ fn config_quic(
     listen_addrs: &[IpAddr],
     runtime: &mut runtime::Runtime,
 ) {
-    use futures::TryFutureExt;
+    use futures_util::TryFutureExt;
 
     let quic_listen_port: u16 = args
         .quic_port

crates/proto/Cargo.toml

@@ -93,7 +93,6 @@ rustls = { workspace = true, optional = true }
 rustls-native-certs = { workspace = true, optional = true }
 rustls-pemfile = { workspace = true, optional = true }
 serde = { workspace = true, features = ["derive"], optional = true }
-smallvec.workspace = true
 socket2 = { workspace = true, optional = true }
 thiserror.workspace = true
 tinyvec = { workspace = true, features = ["alloc"] }

crates/recursor/Cargo.toml

@@ -71,7 +71,6 @@ async-recursion.workspace = true
 bytes.workspace = true
 cfg-if.workspace = true
 enum-as-inner.workspace = true
-futures-executor = { workspace = true, default-features = false, features = ["std"] }
 futures-util = { workspace = true, default-features = false, features = ["std"] }
 lru-cache.workspace = true
 parking_lot.workspace = true
@@ -79,7 +78,6 @@ serde = { workspace = true, features = ["derive"], optional = true }
 thiserror.workspace = true
 tracing.workspace = true
 tokio = { workspace = true, features = ["net"] }
-toml.workspace = true
 trust-dns-proto.workspace = true
 trust-dns-resolver = { workspace = true, features = ["tokio-runtime"] }
 

crates/server/Cargo.toml

@@ -76,7 +76,6 @@ bytes.workspace = true
 cfg-if.workspace = true
 drain.workspace = true
 enum-as-inner.workspace = true
-futures-executor = { workspace = true, default-features = false, features = ["std"] }
 futures-util = { workspace = true, default-features = false, features = ["std"] }
 h2 = { workspace = true, features = ["stream"], optional = true }
 http = { workspace = true, optional = true }
@@ -96,6 +95,7 @@ trust-dns-recursor = { workspace = true, features = ["serde-config"], optional =
 trust-dns-resolver = { workspace = true, features = ["serde-config", "system-config", "tokio-runtime"], optional = true }
 
 [dev-dependencies]
+futures-executor = { workspace = true, default-features = false, features = ["std"] }
 tokio = { workspace = true, features = ["macros", "rt"] }
 tracing-subscriber = { workspace = true, features = ["std", "fmt", "env-filter"] }
 

tests/compatibility-tests/Cargo.toml

@@ -42,8 +42,10 @@ path = "src/lib.rs"
 
 [dependencies]
 data-encoding.workspace = true
+rand.workspace = true
+
+[dev-dependencies]
 futures.workspace = true
 openssl = { workspace = true, features = ["v102", "v110"] }
-rand.workspace = true
 time.workspace = true
 trust-dns-client= { workspace = true, features = ["dnssec-openssl"] }

tests/integration-tests/Cargo.toml

@@ -46,43 +46,42 @@ dnssec-ring = ["dnssec",
                "trust-dns-server/dnssec-ring",
                "trust-dns-client/dnssec-ring", "trust-dns-client/dnssec-openssl",
                "trust-dns-proto/dnssec-ring"]
-dnssec = []
+dnssec = ["dep:openssl"]
 
 # enables experimental the mDNS (multicast) feature
 # TODO: revisit how mdns is implemented in resolver
 # mdns = ["trust-dns-client/mdns", "trust-dns-proto/mdns", "trust-dns-resolver/mdns"]
 
-dns-over-https-rustls = ["trust-dns-client/dns-over-https-rustls", "trust-dns-resolver/dns-over-https-rustls", "dns-over-https", "webpki-roots"]
+dns-over-https-rustls = ["trust-dns-client/dns-over-https-rustls", "trust-dns-resolver/dns-over-https-rustls", "dns-over-https", "dep:rustls", "dep:webpki-roots"]
 dns-over-https = ["trust-dns-proto/dns-over-https"]
 dns-over-quic = ["dns-over-rustls", "trust-dns-proto/dns-over-quic", "trust-dns-resolver/dns-over-quic"]
 
 # TODO: need to make server support rustls and native-tls
 # dns-over-native-tls = ["dns-over-tls",  "trust-dns-resolver/dns-over-native-tls", "trust-dns-server/dns-over-native-tls"]
 dns-over-openssl = ["dns-over-tls", "trust-dns-proto/dns-over-openssl", "trust-dns-resolver/dns-over-openssl", "trust-dns-server/dns-over-openssl"]
-dns-over-rustls = ["dns-over-tls", "trust-dns-proto/dns-over-rustls", "trust-dns-resolver/dns-over-rustls", "trust-dns-server/dns-over-rustls"]
+dns-over-rustls = ["dns-over-tls", "trust-dns-proto/dns-over-rustls", "trust-dns-resolver/dns-over-rustls", "trust-dns-server/dns-over-rustls", "dep:rustls"]
 dns-over-tls = []
 
 sqlite = ["rusqlite", "trust-dns-server/sqlite"]
 
 [dependencies]
 async-trait.workspace = true
-futures.workspace = true
+futures = { workspace = true, features = ["executor"] }
 once_cell.workspace = true
-openssl = { workspace = true, features = ["v102", "v110"] }
+openssl = { workspace = true, optional = true, features = ["v102", "v110"] }
 rand.workspace = true
 rusqlite = { workspace = true, features = ["bundled"], optional = true }
-rustls.workspace = true
+rustls = { workspace = true, optional = true }
 time.workspace = true
 tokio = { workspace = true, features = ["time", "rt"] }
 tracing.workspace = true
-tracing-subscriber = { workspace = true, features = ["std", "fmt", "env-filter"] }
 trust-dns-client.workspace = true
 trust-dns-proto = { workspace = true, features = ["testing"] }
-trust-dns-resolver.workspace = true
+trust-dns-resolver = { workspace = true, features = ["tokio-runtime"] }
-trust-dns-recursor.workspace = true
 trust-dns-server = { workspace = true, features = ["testing"] }
 webpki-roots = { workspace = true, optional = true }
 
 [dev-dependencies]
 futures = { workspace = true, features = ["thread-pool"] }
 tokio = { workspace = true, features = ["macros", "rt"] }
+tracing-subscriber = { workspace = true, features = ["std", "fmt", "env-filter"] }

tests/integration-tests/tests/recursor_tests.rs

@@ -1,18 +0,0 @@
-// Copyright 2015-2022 Benjamin Fry <benjaminfry@me.com>
-//
-// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
-// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
-// http://opensource.org/licenses/MIT>, at your option. This file may not be
-// copied, modified, or distributed except according to those terms.
-
-//! Integration tests for the recursor. These integration tests setup scenarios to verify that the recursor is able
-//!  to recursively resolve various real world scenarios. As new scenarios are discovered, they should be added here.
-
-/// Tests a basic recursive resolution `a.recursive.test.` , `.` -> `test.` -> `recursive.test.` -> `a.recursive.test.`
-///
-/// There are three authorities needed for this test `.` which contains the `test` nameserver, `recursive.test` which is
-///  target zone containing `a.recursive.test.`.
-#[test]
-fn test_basic_recursion() {
-    // TBD
-}