run cargo fix for rust 2024 changes and rustfmt

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

src/core/pdu/builder.rs

@@ -1,11 +1,11 @@
 use std::collections::BTreeMap;
 
 use ruma::{
-	events::{EventContent, MessageLikeEventType, StateEventType, TimelineEventType},
 	MilliSecondsSinceUnixEpoch, OwnedEventId,
+	events::{EventContent, MessageLikeEventType, StateEventType, TimelineEventType},
 };
 use serde::Deserialize;
-use serde_json::value::{to_raw_value, RawValue as RawJsonValue};
+use serde_json::value::{RawValue as RawJsonValue, to_raw_value};
 
 use super::StateKey;
 

src/core/pdu/content.rs

@@ -1,7 +1,7 @@
 use serde::Deserialize;
 use serde_json::value::Value as JsonValue;
 
-use crate::{err, implement, Result};
+use crate::{Result, err, implement};
 
 #[must_use]
 #[implement(super::Pdu)]

src/core/pdu/count.rs

@@ -4,7 +4,7 @@ use std::{cmp::Ordering, fmt, fmt::Display, str::FromStr};
 
 use ruma::api::Direction;
 
-use crate::{err, Error, Result};
+use crate::{Error, Result, err};
 
 #[derive(Hash, PartialEq, Eq, Clone, Copy, Debug)]
 pub enum Count {

src/core/pdu/event.rs

@@ -1,4 +1,4 @@
-use ruma::{events::TimelineEventType, MilliSecondsSinceUnixEpoch, OwnedEventId, RoomId, UserId};
+use ruma::{MilliSecondsSinceUnixEpoch, OwnedEventId, RoomId, UserId, events::TimelineEventType};
 use serde_json::value::RawValue as RawJsonValue;
 
 use super::Pdu;

src/core/pdu/event_id.rs

@@ -1,7 +1,7 @@
 use ruma::{CanonicalJsonObject, OwnedEventId, RoomVersionId};
 use serde_json::value::RawValue as RawJsonValue;
 
-use crate::{err, Result};
+use crate::{Result, err};
 
 /// Generates a correct eventId for the incoming pdu.
 ///

src/core/pdu/mod.rs

@@ -17,13 +17,14 @@ mod unsigned;
 use std::cmp::Ordering;
 
 use ruma::{
-	events::TimelineEventType, CanonicalJsonObject, CanonicalJsonValue, EventId, OwnedEventId,
-	OwnedRoomId, OwnedServerName, OwnedUserId, UInt,
+	CanonicalJsonObject, CanonicalJsonValue, EventId, OwnedEventId, OwnedRoomId, OwnedServerName,
+	OwnedUserId, UInt, events::TimelineEventType,
 };
 use serde::{Deserialize, Serialize};
 use serde_json::value::RawValue as RawJsonValue;
 
 pub use self::{
+	Count as PduCount, Id as PduId, Pdu as PduEvent, RawId as RawPduId,
 	builder::{Builder, Builder as PduBuilder},
 	count::Count,
 	event::Event,
@@ -31,7 +32,6 @@ pub use self::{
 	id::*,
 	raw_id::*,
 	state_key::{ShortStateKey, StateKey},
-	Count as PduCount, Id as PduId, Pdu as PduEvent, RawId as RawPduId,
 };
 use crate::Result;
 

src/core/pdu/raw_id.rs

@@ -55,8 +55,8 @@ impl RawId {
 	#[must_use]
 	pub fn as_bytes(&self) -> &[u8] {
 		match self {
-			| Self::Normal(ref raw) => raw,
-			| Self::Backfilled(ref raw) => raw,
+			| Self::Normal(raw) => raw,
+			| Self::Backfilled(raw) => raw,
 		}
 	}
 }

src/core/pdu/redact.rs

@@ -1,15 +1,15 @@
 use ruma::{
-	canonical_json::redact_content_in_place,
-	events::{room::redaction::RoomRedactionEventContent, TimelineEventType},
 	OwnedEventId, RoomVersionId,
+	canonical_json::redact_content_in_place,
+	events::{TimelineEventType, room::redaction::RoomRedactionEventContent},
 };
 use serde::Deserialize;
 use serde_json::{
 	json,
-	value::{to_raw_value, RawValue as RawJsonValue},
+	value::{RawValue as RawJsonValue, to_raw_value},
 };
 
-use crate::{implement, Error, Result};
+use crate::{Error, Result, implement};
 
 #[derive(Deserialize)]
 struct ExtractRedactedBecause {
@@ -76,14 +76,21 @@ pub fn copy_redacts(&self) -> (Option<OwnedEventId>, Box<RawJsonValue>) {
 		if let Ok(mut content) =
 			serde_json::from_str::<RoomRedactionEventContent>(self.content.get())
 		{
-			if let Some(redacts) = content.redacts {
-				return (Some(redacts), self.content.clone());
-			} else if let Some(redacts) = self.redacts.clone() {
-				content.redacts = Some(redacts);
-				return (
-					self.redacts.clone(),
-					to_raw_value(&content).expect("Must be valid, we only added redacts field"),
-				);
+			match content.redacts {
+				| Some(redacts) => {
+					return (Some(redacts), self.content.clone());
+				},
+				| _ => match self.redacts.clone() {
+					| Some(redacts) => {
+						content.redacts = Some(redacts);
+						return (
+							self.redacts.clone(),
+							to_raw_value(&content)
+								.expect("Must be valid, we only added redacts field"),
+						);
+					},
+					| _ => {},
+				},
 			}
 		}
 	}

src/core/pdu/strip.rs

@@ -1,8 +1,8 @@
 use ruma::{
 	events::{
-		room::member::RoomMemberEventContent, space::child::HierarchySpaceChildEvent,
 		AnyEphemeralRoomEvent, AnyMessageLikeEvent, AnyStateEvent, AnyStrippedStateEvent,
 		AnySyncStateEvent, AnySyncTimelineEvent, AnyTimelineEvent, StateEvent,
+		room::member::RoomMemberEventContent, space::child::HierarchySpaceChildEvent,
 	},
 	serde::Raw,
 };

src/core/pdu/unsigned.rs

@@ -2,10 +2,10 @@ use std::collections::BTreeMap;
 
 use ruma::MilliSecondsSinceUnixEpoch;
 use serde::Deserialize;
-use serde_json::value::{to_raw_value, RawValue as RawJsonValue, Value as JsonValue};
+use serde_json::value::{RawValue as RawJsonValue, Value as JsonValue, to_raw_value};
 
 use super::Pdu;
-use crate::{err, implement, is_true, Result};
+use crate::{Result, err, implement, is_true};
 
 #[implement(Pdu)]
 pub fn remove_transaction_id(&mut self) -> Result {