run cargo fix for rust 2024 changes and rustfmt

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

src/service/server_keys/acquire.rs

@@ -7,13 +7,13 @@ use std::{
 use conduwuit::{
 	debug, debug_error, debug_warn, error, implement, info, result::FlatOk, trace, warn,
 };
-use futures::{stream::FuturesUnordered, StreamExt};
+use futures::{StreamExt, stream::FuturesUnordered};
 use ruma::{
-	api::federation::discovery::ServerSigningKeys, serde::Raw, CanonicalJsonObject,
-	OwnedServerName, OwnedServerSigningKeyId, ServerName, ServerSigningKeyId,
+	CanonicalJsonObject, OwnedServerName, OwnedServerSigningKeyId, ServerName,
+	ServerSigningKeyId, api::federation::discovery::ServerSigningKeys, serde::Raw,
 };
 use serde_json::value::RawValue as RawJsonValue;
-use tokio::time::{timeout_at, Instant};
+use tokio::time::{Instant, timeout_at};
 
 use super::key_exists;
 

src/service/server_keys/get.rs

@@ -1,12 +1,12 @@
 use std::borrow::Borrow;
 
-use conduwuit::{implement, Err, Result};
+use conduwuit::{Err, Result, implement};
 use ruma::{
-	api::federation::discovery::VerifyKey, CanonicalJsonObject, RoomVersionId, ServerName,
-	ServerSigningKeyId,
+	CanonicalJsonObject, RoomVersionId, ServerName, ServerSigningKeyId,
+	api::federation::discovery::VerifyKey,
 };
 
-use super::{extract_key, PubKeyMap, PubKeys};
+use super::{PubKeyMap, PubKeys, extract_key};
 
 #[implement(super::Service)]
 pub async fn get_event_keys(

src/service/server_keys/keypair.rs

@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use conduwuit::{debug, debug_info, err, error, utils, utils::string_from_bytes, Result};
+use conduwuit::{Result, debug, debug_info, err, error, utils, utils::string_from_bytes};
 use database::Database;
 use ruma::{api::federation::discovery::VerifyKey, serde::Base64, signatures::Ed25519KeyPair};
 

src/service/server_keys/mod.rs

@@ -8,22 +8,21 @@ mod verify;
 use std::{collections::BTreeMap, sync::Arc, time::Duration};
 
 use conduwuit::{
-	implement,
-	utils::{timepoint_from_now, IterStream},
-	Result, Server,
+	Result, Server, implement,
+	utils::{IterStream, timepoint_from_now},
 };
 use database::{Deserialized, Json, Map};
 use futures::StreamExt;
 use ruma::{
+	CanonicalJsonObject, MilliSecondsSinceUnixEpoch, OwnedServerSigningKeyId, RoomVersionId,
+	ServerName, ServerSigningKeyId,
 	api::federation::discovery::{ServerSigningKeys, VerifyKey},
 	serde::Raw,
 	signatures::{Ed25519KeyPair, PublicKeyMap, PublicKeySet},
-	CanonicalJsonObject, MilliSecondsSinceUnixEpoch, OwnedServerSigningKeyId, RoomVersionId,
-	ServerName, ServerSigningKeyId,
 };
 use serde_json::value::RawValue as RawJsonValue;
 
-use crate::{globals, sending, Dep};
+use crate::{Dep, globals, sending};
 
 pub struct Service {
 	keypair: Box<Ed25519KeyPair>,

src/service/server_keys/request.rs

@@ -1,13 +1,13 @@
 use std::{collections::BTreeMap, fmt::Debug};
 
-use conduwuit::{debug, implement, Err, Result};
+use conduwuit::{Err, Result, debug, implement};
 use ruma::{
-	api::federation::discovery::{
-		get_remote_server_keys,
-		get_remote_server_keys_batch::{self, v2::QueryCriteria},
-		get_server_keys, ServerSigningKeys,
-	},
 	OwnedServerName, OwnedServerSigningKeyId, ServerName, ServerSigningKeyId,
+	api::federation::discovery::{
+		ServerSigningKeys, get_remote_server_keys,
+		get_remote_server_keys_batch::{self, v2::QueryCriteria},
+		get_server_keys,
+	},
 };
 
 #[implement(super::Service)]
@@ -79,7 +79,7 @@ pub async fn notary_request(
 	&self,
 	notary: &ServerName,
 	target: &ServerName,
-) -> Result<impl Iterator<Item = ServerSigningKeys> + Clone + Debug + Send> {
+) -> Result<impl Iterator<Item = ServerSigningKeys> + Clone + Debug + Send + use<>> {
 	use get_remote_server_keys::v2::Request;
 
 	let request = Request {

src/service/server_keys/sign.rs

@@ -1,4 +1,4 @@
-use conduwuit::{implement, Result};
+use conduwuit::{Result, implement};
 use ruma::{CanonicalJsonObject, RoomVersionId};
 
 #[implement(super::Service)]

src/service/server_keys/verify.rs

@@ -1,6 +1,6 @@
-use conduwuit::{implement, pdu::gen_event_id_canonical_json, Err, Result};
+use conduwuit::{Err, Result, implement, pdu::gen_event_id_canonical_json};
 use ruma::{
-	signatures::Verified, CanonicalJsonObject, CanonicalJsonValue, OwnedEventId, RoomVersionId,
+	CanonicalJsonObject, CanonicalJsonValue, OwnedEventId, RoomVersionId, signatures::Verified,
 };
 use serde_json::value::RawValue as RawJsonValue;