pep/xmpp-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tokio-xmpp: Update hickory-dns dep (previously trust-dns)

Browse source 
Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>
This commit is contained in:
Maxime “pep” Buquet 2023-10-25 00:47:41 +02:00 committed by Link Mauve
parent c56dbe8903
commit 115edf6f25
3 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tokio-xmpp/Cargo.toml
View file

@ -23,8 +23,7 @@ tokio-native-tls = { version = "0.3", optional = true }
tokio-rustls = { version = "0.24", optional = true } tokio-rustls = { version = "0.24", optional = true }
tokio-stream = { version = "0.1", features = [] } tokio-stream = { version = "0.1", features = [] }
tokio-util = { version = "0.7", features = ["codec"] } tokio-util = { version = "0.7", features = ["codec"] }
trust-dns-proto = "0.22" hickory-resolver = "0.24"
trust-dns-resolver = "0.22"
xmpp-parsers = "0.20" xmpp-parsers = "0.20"
minidom = "0.15" minidom = "0.15"
rxml = "0.9.1" rxml = "0.9.1"

3
tokio-xmpp/src/error.rs
View file

@ -1,3 +1,4 @@
use hickory_resolver::{error::ResolveError, proto::error::ProtoError};
#[cfg(feature = "tls-native")] #[cfg(feature = "tls-native")]
use native_tls::Error as TlsError; use native_tls::Error as TlsError;
use sasl::client::MechanismError as SaslMechanismError; use sasl::client::MechanismError as SaslMechanismError;
@ -10,8 +11,6 @@ use std::str::Utf8Error;
use tokio_rustls::rustls::client::InvalidDnsNameError; use tokio_rustls::rustls::client::InvalidDnsNameError;
#[cfg(all(feature = "tls-rust", not(feature = "tls-native")))] #[cfg(all(feature = "tls-rust", not(feature = "tls-native")))]
use tokio_rustls::rustls::Error as TlsError; 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::sasl::DefinedCondition as SaslDefinedCondition;
use xmpp_parsers::{Error as ParsersError, JidParseError}; use xmpp_parsers::{Error as ParsersError, JidParseError};

2
tokio-xmpp/src/happy_eyeballs.rs
View file

@ -1,9 +1,9 @@
use crate::{ConnecterError, Error}; use crate::{ConnecterError, Error};
use hickory_resolver::{IntoName, TokioAsyncResolver};
use idna; use idna;
use log::debug; use log::debug;
use std::net::SocketAddr; use std::net::SocketAddr;
use tokio::net::TcpStream; use tokio::net::TcpStream;
use trust_dns_resolver::{IntoName, TokioAsyncResolver};
pub async fn connect_to_host(domain: &str, port: u16) -> Result<TcpStream, Error> { 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)?; let ascii_domain = idna::domain_to_ascii(&domain).map_err(|_| Error::Idna)?;