From 115edf6f25ff5a07ee04982df8eccb1f0cbd9df9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maxime=20=E2=80=9Cpep=E2=80=9D=20Buquet?= <pep@bouah.net>
Date: Wed, 25 Oct 2023 00:47:41 +0200
Subject: [PATCH] tokio-xmpp: Update hickory-dns dep (previously trust-dns)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>
---
 tokio-xmpp/Cargo.toml            | 3 +--
 tokio-xmpp/src/error.rs          | 3 +--
 tokio-xmpp/src/happy_eyeballs.rs | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/tokio-xmpp/Cargo.toml b/tokio-xmpp/Cargo.toml
index 895787e9..bb6c8ce8 100644
--- a/tokio-xmpp/Cargo.toml
+++ b/tokio-xmpp/Cargo.toml
@@ -23,8 +23,7 @@ tokio-native-tls = { version = "0.3", optional = true }
 tokio-rustls = { version = "0.24", optional = true }
 tokio-stream = { version = "0.1", features = [] }
 tokio-util = { version = "0.7", features = ["codec"] }
-trust-dns-proto = "0.22"
-trust-dns-resolver = "0.22"
+hickory-resolver = "0.24"
 xmpp-parsers = "0.20"
 minidom = "0.15"
 rxml = "0.9.1"
diff --git a/tokio-xmpp/src/error.rs b/tokio-xmpp/src/error.rs
index 96311f0d..38693657 100644
--- a/tokio-xmpp/src/error.rs
+++ b/tokio-xmpp/src/error.rs
@@ -1,3 +1,4 @@
+use hickory_resolver::{error::ResolveError, proto::error::ProtoError};
 #[cfg(feature = "tls-native")]
 use native_tls::Error as TlsError;
 use sasl::client::MechanismError as SaslMechanismError;
@@ -10,8 +11,6 @@ use std::str::Utf8Error;
 use tokio_rustls::rustls::client::InvalidDnsNameError;
 #[cfg(all(feature = "tls-rust", not(feature = "tls-native")))]
 use tokio_rustls::rustls::Error as TlsError;
-use trust_dns_proto::error::ProtoError;
-use trust_dns_resolver::error::ResolveError;
 
 use xmpp_parsers::sasl::DefinedCondition as SaslDefinedCondition;
 use xmpp_parsers::{Error as ParsersError, JidParseError};
diff --git a/tokio-xmpp/src/happy_eyeballs.rs b/tokio-xmpp/src/happy_eyeballs.rs
index 123a5a2c..abe48275 100644
--- a/tokio-xmpp/src/happy_eyeballs.rs
+++ b/tokio-xmpp/src/happy_eyeballs.rs
@@ -1,9 +1,9 @@
 use crate::{ConnecterError, Error};
+use hickory_resolver::{IntoName, TokioAsyncResolver};
 use idna;
 use log::debug;
 use std::net::SocketAddr;
 use tokio::net::TcpStream;
-use trust_dns_resolver::{IntoName, TokioAsyncResolver};
 
 pub async fn connect_to_host(domain: &str, port: u16) -> Result<TcpStream, Error> {
     let ascii_domain = idna::domain_to_ascii(&domain).map_err(|_| Error::Idna)?;