Update to hickory-resolver 0.25 (#1507)

Author: tottoto

Cargo.lock

@@ -98,8 +98,8 @@ futures-io = "0.3.21"
 futures-core = "0.3.14"
 futures-util = { version = "0.3.14", features = ["io"] }
 hex = "0.4.0"
-hickory-proto = { version = "0.24.2", optional = true }
-hickory-resolver = { version = "0.24.2", optional = true }
+hickory-proto = { version = "0.25", optional = true }
+hickory-resolver = { version = "0.25", optional = true }
 hmac = "0.12.1"
 log = { version = "0.4.17", optional = true }
 md-5 = "0.10.1"

Cargo.toml

@@ -5,12 +5,41 @@ use hickory_resolver::config::ResolverConfig as HickoryResolverConfig;
 ///
 /// This is a thin wrapper around a `hickory_resolver::config::ResolverConfig` provided to ensure
 /// API stability.
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug)]
+#[cfg_attr(not(feature = "dns-resolver"), derive(PartialEq))]
 pub struct ResolverConfig {
     #[cfg(feature = "dns-resolver")]
     pub(crate) inner: HickoryResolverConfig,
 }
 
+#[cfg(feature = "dns-resolver")]
+impl PartialEq for ResolverConfig {
+    fn eq(&self, other: &Self) -> bool {
+        let (left, right) = (&self.inner, &other.inner);
+
+        if !(left.domain() == right.domain()
+            && left.search() == right.search()
+            && left.name_servers().len() == right.name_servers().len())
+        {
+            return false;
+        }
+
+        for (a, b) in std::iter::zip(left.name_servers(), right.name_servers()) {
+            if !(a.socket_addr == b.socket_addr
+                && a.protocol == b.protocol
+                && a.tls_dns_name == b.tls_dns_name
+                && a.http_endpoint == b.http_endpoint
+                && a.trust_negative_responses == b.trust_negative_responses
+                && a.bind_addr == b.bind_addr)
+            {
+                return false;
+            }
+        }
+
+        true
+    }
+}
+
 #[cfg(feature = "dns-resolver")]
 impl ResolverConfig {
     /// Creates a default configuration, using 1.1.1.1, 1.0.0.1 and 2606:4700:4700::1111,