chore: Upgrade matrix-sdk to edition 2024 and format

Author: jplatte

crates/matrix-sdk-common/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 authors = ["Damir Jelić <[email protected]>"]
 description = "Collection of common types and imports used in the matrix-sdk"
-edition = "2021"
+edition = "2024"
 homepage = "https://github.com/matrix-org/matrix-rust-sdk"
 keywords = ["matrix", "chat", "messaging", "ruma", "nio"]
 license = "Apache-2.0"

crates/matrix-sdk-common/src/deserialized_responses.rs

@@ -17,6 +17,7 @@ use std::{collections::BTreeMap, fmt, sync::Arc};
 #[cfg(doc)]
 use ruma::events::AnyTimelineEvent;
 use ruma::{
+    DeviceKeyAlgorithm, OwnedDeviceId, OwnedEventId, OwnedUserId,
     events::{
         AnyMessageLikeEvent, AnySyncMessageLikeEvent, AnySyncTimelineEvent, AnyToDeviceEvent,
         MessageLikeEventType,
@@ -26,7 +27,6 @@ use ruma::{
         AsRefStr, AsStrAsRefStr, DebugAsRefStr, DeserializeFromCowStr, FromString, JsonObject, Raw,
         SerializeAsRefStr,
     },
-    DeviceKeyAlgorithm, OwnedDeviceId, OwnedEventId, OwnedUserId,
 };
 use serde::{Deserialize, Serialize};
 use tracing::warn;
@@ -1266,8 +1266,8 @@ mod tests {
     use assert_matches2::assert_let;
     use insta::{assert_json_snapshot, with_settings};
     use ruma::{
-        device_id, event_id, events::room::message::RoomMessageEventContent, serde::Raw, user_id,
-        DeviceKeyAlgorithm,
+        DeviceKeyAlgorithm, device_id, event_id, events::room::message::RoomMessageEventContent,
+        serde::Raw, user_id,
     };
     use serde::Deserialize;
     use serde_json::json;

crates/matrix-sdk-common/src/executor.rs

@@ -29,7 +29,7 @@ use std::{
 mod sys {
     pub use tokio::{
         runtime::{Handle, Runtime},
-        task::{spawn, AbortHandle, JoinError, JoinHandle},
+        task::{AbortHandle, JoinError, JoinHandle, spawn},
     };
 }
 
@@ -43,8 +43,8 @@ mod sys {
 
     pub use futures_util::future::AbortHandle;
     use futures_util::{
-        future::{Abortable, RemoteHandle},
         FutureExt,
+        future::{Abortable, RemoteHandle},
     };
 
     /// A Wasm specific version of `tokio::task::JoinError` designed to work

crates/matrix-sdk-common/src/js_tracing.rs

@@ -23,11 +23,11 @@ use std::{
     sync::atomic::{AtomicU32, Ordering},
 };
 
-use tracing::{field::Field, level_filters::LevelFilter, Event, Level, Metadata};
+use tracing::{Event, Level, Metadata, field::Field, level_filters::LevelFilter};
 use tracing_subscriber::{
     fmt::{
-        format::{DefaultFields, Writer},
         FmtContext, FormatEvent, FormatFields, FormattedFields, MakeWriter, Subscriber,
+        format::{DefaultFields, Writer},
     },
     registry::LookupSpan,
 };

crates/matrix-sdk-common/src/lib.rs

@@ -42,7 +42,7 @@ pub mod ttl_cache;
 #[cfg(all(target_family = "wasm", not(tarpaulin_include)))]
 pub mod js_tracing;
 
-use ruma::{room_version_rules::RoomVersionRules, RoomVersionId};
+use ruma::{RoomVersionId, room_version_rules::RoomVersionRules};
 pub use store_locks::LEASE_DURATION_MS;
 
 /// Alias for `Send` on non-wasm, empty trait (implemented by everything) on

crates/matrix-sdk-common/src/linked_chunk/as_vector.rs

@@ -22,8 +22,8 @@ use std::{
 use eyeball_im::VectorDiff;
 
 use super::{
-    updates::{ReaderToken, Update, UpdatesInner},
     ChunkContent, ChunkIdentifier, Iter, Position,
+    updates::{ReaderToken, Update, UpdatesInner},
 };
 use crate::linked_chunk::ChunkMetadata;
 
@@ -509,7 +509,7 @@ mod tests {
     use std::fmt::Debug;
 
     use assert_matches::assert_matches;
-    use imbl::{vector, Vector};
+    use imbl::{Vector, vector};
 
     use super::{
         super::{Chunk, ChunkIdentifierGenerator, LinkedChunk, Update},

crates/matrix-sdk-common/src/linked_chunk/lazy_loader.rs

@@ -371,9 +371,9 @@ mod tests {
     use assert_matches::assert_matches;
 
     use super::{
-        super::Position, from_all_chunks, from_last_chunk, insert_new_first_chunk, replace_with,
-        ChunkContent, ChunkIdentifier, ChunkIdentifierGenerator, LazyLoaderError, LinkedChunk,
-        RawChunk, Update,
+        super::Position, ChunkContent, ChunkIdentifier, ChunkIdentifierGenerator, LazyLoaderError,
+        LinkedChunk, RawChunk, Update, from_all_chunks, from_last_chunk, insert_new_first_chunk,
+        replace_with,
     };
 
     #[test]

crates/matrix-sdk-common/src/linked_chunk/mod.rs

@@ -1786,7 +1786,7 @@ pub struct ChunkMetadata {
 mod tests {
     use std::{
         ops::Not,
-        sync::{atomic::Ordering, Arc},
+        sync::{Arc, atomic::Ordering},
     };
 
     use assert_matches::assert_matches;

crates/matrix-sdk-common/src/linked_chunk/order_tracker.rs

@@ -17,8 +17,8 @@ use std::sync::{Arc, RwLock};
 use eyeball_im::VectorDiff;
 
 use super::{
-    updates::{ReaderToken, Update, UpdatesInner},
     Position,
+    updates::{ReaderToken, Update, UpdatesInner},
 };
 use crate::linked_chunk::{ChunkMetadata, UpdateToVectorDiff};
 
@@ -168,8 +168,8 @@ mod tests {
     use matrix_sdk_test_macros::async_test;
 
     use crate::linked_chunk::{
-        lazy_loader::from_last_chunk, ChunkContent, ChunkIdentifier, ChunkIdentifierGenerator,
-        ChunkMetadata, LinkedChunk, OrderTracker, Position, RawChunk, Update,
+        ChunkContent, ChunkIdentifier, ChunkIdentifierGenerator, ChunkMetadata, LinkedChunk,
+        OrderTracker, Position, RawChunk, Update, lazy_loader::from_last_chunk,
     };
 
     #[async_test]

crates/matrix-sdk-common/src/ring_buffer.rs

@@ -14,8 +14,8 @@
 
 use std::{
     collections::{
-        vec_deque::{Drain, Iter, IterMut},
         VecDeque,
+        vec_deque::{Drain, Iter, IterMut},
     },
     num::NonZeroUsize,
     ops::RangeBounds,