chore(base): Run rustfmt from nightly.

Author: Hywan

crates/matrix-sdk-base/src/rooms/call.rs

@@ -58,7 +58,6 @@ mod tests {
         },
         room_id, user_id, DeviceId, EventId, MilliSecondsSinceUnixEpoch, OwnedUserId, UserId,
     };
-
     use similar_asserts::assert_eq;
 
     use super::super::{Room, RoomState};

crates/matrix-sdk-base/src/rooms/display_name.rs

@@ -23,14 +23,13 @@ use ruma::{
 use serde::{Deserialize, Serialize};
 use tracing::{debug, trace, warn};
 
+use super::{Room, RoomMemberships};
 use crate::{
     deserialized_responses::SyncOrStrippedState,
     store::{Result as StoreResult, StateStoreExt},
     RoomMember, RoomState,
 };
 
-use super::{Room, RoomMemberships};
-
 impl Room {
     /// Calculate a room's display name, or return the cached value, taking into
     /// account its name, aliases and members.
@@ -513,13 +512,6 @@ mod tests {
     use std::{collections::BTreeSet, sync::Arc};
 
     use matrix_sdk_test::{async_test, event_factory::EventFactory};
-    use serde_json::json;
-
-    use super::{compute_display_name_from_heroes, Room, RoomDisplayName};
-    use crate::{
-        store::MemoryStore, MinimalStateEvent, OriginalMinimalStateEvent, RoomState, StateChanges,
-        StateStore,
-    };
     use ruma::{
         api::client::sync::sync_events::v3::RoomSummary as RumaSummary,
         assign,
@@ -535,6 +527,13 @@ mod tests {
         serde::Raw,
         user_id, UserId,
     };
+    use serde_json::json;
+
+    use super::{compute_display_name_from_heroes, Room, RoomDisplayName};
+    use crate::{
+        store::MemoryStore, MinimalStateEvent, OriginalMinimalStateEvent, RoomState, StateChanges,
+        StateStore,
+    };
 
     fn make_room_test_helper(room_type: RoomState) -> (Arc<MemoryStore>, Room) {
         let store = Arc::new(MemoryStore::new());

crates/matrix-sdk-base/src/rooms/latest_event.rs

@@ -15,14 +15,14 @@
 #[cfg(feature = "e2e-encryption")]
 use std::{collections::BTreeMap, num::NonZeroUsize};
 
+#[cfg(feature = "e2e-encryption")]
+use ruma::{events::AnySyncTimelineEvent, serde::Raw, OwnedRoomId};
+
 use super::Room;
 #[cfg(feature = "e2e-encryption")]
 use super::RoomInfoNotableUpdateReasons;
 use crate::latest_event::LatestEvent;
 
-#[cfg(feature = "e2e-encryption")]
-use ruma::{events::AnySyncTimelineEvent, serde::Raw, OwnedRoomId};
-
 impl Room {
     /// The size of the latest_encrypted_events RingBuffer
     #[cfg(feature = "e2e-encryption")]
@@ -81,6 +81,12 @@ impl Room {
 mod tests_with_e2e_encryption {
     use std::sync::Arc;
 
+    use assert_matches::assert_matches;
+    use matrix_sdk_common::deserialized_responses::TimelineEvent;
+    use matrix_sdk_test::async_test;
+    use ruma::{room_id, serde::Raw, user_id};
+    use serde_json::json;
+
     use crate::{
         latest_event::LatestEvent,
         response_processors as processors,
@@ -89,12 +95,6 @@ mod tests_with_e2e_encryption {
         SessionMeta, StateChanges,
     };
 
-    use assert_matches::assert_matches;
-    use matrix_sdk_common::deserialized_responses::TimelineEvent;
-    use matrix_sdk_test::async_test;
-    use ruma::{room_id, serde::Raw, user_id};
-    use serde_json::json;
-
     fn make_room_test_helper(room_type: RoomState) -> (Arc<MemoryStore>, Room) {
         let store = Arc::new(MemoryStore::new());
         let user_id = user_id!("@me:example.org");

crates/matrix-sdk-base/src/rooms/mod.rs

@@ -25,14 +25,13 @@ mod room_info;
 mod state;
 mod tags;
 
-use crate::{
-    deserialized_responses::MemberEvent,
-    notification_settings::RoomNotificationMode,
-    read_receipts::RoomReadReceipts,
-    store::{DynStateStore, Result as StoreResult, StateStoreExt},
-    sync::UnreadNotificationsCount,
-    Error, MinimalStateEvent,
+#[cfg(feature = "e2e-encryption")]
+use std::sync::RwLock as SyncRwLock;
+use std::{
+    collections::{BTreeMap, HashSet},
+    sync::Arc,
 };
+
 pub use create::*;
 pub use display_name::{RoomDisplayName, RoomHero};
 pub(crate) use display_name::{RoomSummary, UpdatedRoomDisplayName};
@@ -66,16 +65,19 @@ use ruma::{
 };
 use serde::{Deserialize, Serialize};
 pub use state::{RoomState, RoomStateFilter};
-#[cfg(feature = "e2e-encryption")]
-use std::sync::RwLock as SyncRwLock;
-use std::{
-    collections::{BTreeMap, HashSet},
-    sync::Arc,
-};
 pub(crate) use tags::RoomNotableTags;
 use tokio::sync::broadcast;
 use tracing::{info, instrument, warn};
 
+use crate::{
+    deserialized_responses::MemberEvent,
+    notification_settings::RoomNotificationMode,
+    read_receipts::RoomReadReceipts,
+    store::{DynStateStore, Result as StoreResult, StateStoreExt},
+    sync::UnreadNotificationsCount,
+    Error, MinimalStateEvent,
+};
+
 /// The underlying room data structure collecting state for joined, left and
 /// invited rooms.
 #[derive(Debug, Clone)]

crates/matrix-sdk-base/src/rooms/room_info.rs

@@ -1157,16 +1157,6 @@ impl Default for RoomInfoNotableUpdateReasons {
 mod tests {
     use std::sync::Arc;
 
-    use super::{BaseRoomInfo, RoomInfo, SyncInfo};
-    use crate::{
-        latest_event::LatestEvent,
-        notification_settings::RoomNotificationMode,
-        rooms::{RoomNotableTags, RoomSummary},
-        store::{IntoStateStore, MemoryStore},
-        sync::UnreadNotificationsCount,
-        RoomDisplayName, RoomHero, RoomState, StateChanges,
-    };
-
     use matrix_sdk_common::deserialized_responses::TimelineEvent;
     use matrix_sdk_test::{
         async_test,
@@ -1178,6 +1168,16 @@ mod tests {
     };
     use serde_json::json;
 
+    use super::{BaseRoomInfo, RoomInfo, SyncInfo};
+    use crate::{
+        latest_event::LatestEvent,
+        notification_settings::RoomNotificationMode,
+        rooms::{RoomNotableTags, RoomSummary},
+        store::{IntoStateStore, MemoryStore},
+        sync::UnreadNotificationsCount,
+        RoomDisplayName, RoomHero, RoomState, StateChanges,
+    };
+
     #[test]
     fn test_room_info_serialization() {
         // This test exists to make sure we don't accidentally change the