Skip to content

Commit

Permalink
switch to hickory-dns / hickory_resolver
Browse files Browse the repository at this point in the history
trust-dns rebranded to hickry-dns

Signed-off-by: strawberry <[email protected]>
  • Loading branch information
girlbossceo committed Mar 12, 2024
1 parent 1409e9c commit 1fd1433
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 50 deletions.
93 changes: 46 additions & 47 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ base64 = "0.22.0"
ring = "0.17.8"

# Used when querying the SRV record of other servers
trust-dns-resolver = "0.23.2"
hickory-resolver = "0.24.0"

# Used to find matching events for appservices
regex = "1.10.3"
Expand Down
2 changes: 1 addition & 1 deletion src/api/server_server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ use std::{
use axum::{response::IntoResponse, Json};
use futures_util::future::TryFutureExt;
use get_profile_information::v1::ProfileField;
use hickory_resolver::{error::ResolveError, lookup::SrvLookup};
use http::header::{HeaderValue, AUTHORIZATION};
use ipaddress::IPAddress;
use ruma::{
Expand Down Expand Up @@ -52,7 +53,6 @@ use ruma::{
use serde_json::value::{to_raw_value, RawValue as RawJsonValue};
use tokio::sync::RwLock;
use tracing::{debug, error, info, warn};
use trust_dns_resolver::{error::ResolveError, lookup::SrvLookup};

use crate::{
api::client_server::{self, claim_keys_helper, get_keys_helper},
Expand Down
2 changes: 1 addition & 1 deletion src/service/globals/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ use argon2::Argon2;
use base64::{engine::general_purpose, Engine as _};
pub use data::Data;
use futures_util::FutureExt;
use hickory_resolver::TokioAsyncResolver;
use hyper::{
client::connect::dns::{GaiResolver, Name},
service::Service as HyperService,
Expand All @@ -34,7 +35,6 @@ use ruma::{
};
use tokio::sync::{broadcast, watch::Receiver, Mutex, RwLock, Semaphore};
use tracing::{error, info};
use trust_dns_resolver::TokioAsyncResolver;

use crate::{api::server_server::FedDest, services, Config, Error, Result};

Expand Down

0 comments on commit 1fd1433

Please sign in to comment.