run cargo fix for rust 2024 changes and rustfmt

Signed-off-by: June Clementine Strawberry <strawberry@puppygock.gay>

src/service/resolver/actual.rs

@@ -3,7 +3,7 @@ use std::{
 	net::{IpAddr, SocketAddr},
 };
 
-use conduwuit::{debug, debug_error, debug_info, debug_warn, err, error, trace, Err, Result};
+use conduwuit::{Err, Result, debug, debug_error, debug_info, debug_warn, err, error, trace};
 use futures::{FutureExt, TryFutureExt};
 use hickory_resolver::error::ResolveError;
 use ipaddress::IPAddress;
@@ -11,7 +11,7 @@ use ruma::ServerName;
 
 use super::{
 	cache::{CachedDest, CachedOverride, MAX_IPS},
-	fed::{add_port_to_hostname, get_ip_with_port, FedDest, PortString},
+	fed::{FedDest, PortString, add_port_to_hostname, get_ip_with_port},
 };
 
 #[derive(Clone, Debug)]
@@ -71,12 +71,16 @@ impl super::Service {
 			| None =>
 				if let Some(pos) = dest.as_str().find(':') {
 					self.actual_dest_2(dest, cache, pos).await?
-				} else if let Some(delegated) = self.request_well_known(dest.as_str()).await? {
-					self.actual_dest_3(&mut host, cache, delegated).await?
-				} else if let Some(overrider) = self.query_srv_record(dest.as_str()).await? {
-					self.actual_dest_4(&host, cache, overrider).await?
 				} else {
-					self.actual_dest_5(dest, cache).await?
+					match self.request_well_known(dest.as_str()).await? {
+						| Some(delegated) =>
+							self.actual_dest_3(&mut host, cache, delegated).await?,
+						| _ => match self.query_srv_record(dest.as_str()).await? {
+							| Some(overrider) =>
+								self.actual_dest_4(&host, cache, overrider).await?,
+							| _ => self.actual_dest_5(dest, cache).await?,
+						},
+					}
 				},
 		};
 
@@ -136,10 +140,10 @@ impl super::Service {
 					self.actual_dest_3_2(cache, delegated, pos).await
 				} else {
 					trace!("Delegated hostname has no port in this branch");
-					if let Some(overrider) = self.query_srv_record(&delegated).await? {
-						self.actual_dest_3_3(cache, delegated, overrider).await
-					} else {
-						self.actual_dest_3_4(cache, delegated).await
+					match self.query_srv_record(&delegated).await? {
+						| Some(overrider) =>
+							self.actual_dest_3_3(cache, delegated, overrider).await,
+						| _ => self.actual_dest_3_4(cache, delegated).await,
 					}
 				},
 		}

src/service/resolver/cache.rs

@@ -1,10 +1,10 @@
 use std::{net::IpAddr, sync::Arc, time::SystemTime};
 
 use conduwuit::{
+	Result,
 	arrayvec::ArrayVec,
 	at, err, implement,
 	utils::{math::Expected, rand, stream::TryIgnore},
-	Result,
 };
 use database::{Cbor, Deserialized, Map};
 use futures::{Stream, StreamExt};
@@ -96,7 +96,7 @@ pub fn destinations(&self) -> impl Stream<Item = (&ServerName, CachedDest)> + Se
 	self.destinations
 		.stream()
 		.ignore_err()
-		.map(|item: (&ServerName, Cbor<_>)| (item.0, item.1 .0))
+		.map(|item: (&ServerName, Cbor<_>)| (item.0, item.1.0))
 }
 
 #[implement(Cache)]
@@ -104,7 +104,7 @@ pub fn overrides(&self) -> impl Stream<Item = (&ServerName, CachedOverride)> + S
 	self.overrides
 		.stream()
 		.ignore_err()
-		.map(|item: (&ServerName, Cbor<_>)| (item.0, item.1 .0))
+		.map(|item: (&ServerName, Cbor<_>)| (item.0, item.1.0))
 }
 
 impl CachedDest {

src/service/resolver/dns.rs

@@ -1,8 +1,8 @@
 use std::{net::SocketAddr, sync::Arc, time::Duration};
 
-use conduwuit::{err, Result, Server};
+use conduwuit::{Result, Server, err};
 use futures::FutureExt;
-use hickory_resolver::{lookup_ip::LookupIp, TokioAsyncResolver};
+use hickory_resolver::{TokioAsyncResolver, lookup_ip::LookupIp};
 use reqwest::dns::{Addrs, Name, Resolve, Resolving};
 
 use super::cache::{Cache, CachedOverride};

src/service/resolver/mod.rs

@@ -6,10 +6,10 @@ mod tests;
 
 use std::sync::Arc;
 
-use conduwuit::{arrayvec::ArrayString, utils::MutexMap, Result, Server};
+use conduwuit::{Result, Server, arrayvec::ArrayString, utils::MutexMap};
 
 use self::{cache::Cache, dns::Resolver};
-use crate::{client, Dep};
+use crate::{Dep, client};
 
 pub struct Service {
 	pub cache: Arc<Cache>,

src/service/resolver/tests.rs

@@ -1,6 +1,6 @@
 #![cfg(test)]
 
-use super::fed::{add_port_to_hostname, get_ip_with_port, FedDest};
+use super::fed::{FedDest, add_port_to_hostname, get_ip_with_port};
 
 #[test]
 fn ips_get_default_ports() {