chore: Upgrade testing crates to Rust Edition 2024

Author: jplatte

testing/matrix-sdk-integration-testing/Cargo.toml

@@ -2,7 +2,7 @@
 name = "matrix-sdk-integration-testing"
 description = "Internal integration testing for matrix-sdk crate"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 publish = false
 license = "Apache-2.0"
 

testing/matrix-sdk-integration-testing/src/helpers.rs

@@ -10,21 +10,21 @@ use std::{
 use anyhow::Result;
 use assign::assign;
 use matrix_sdk::{
+    Client, ClientBuilder, Room,
     config::{RequestConfig, SyncSettings},
     encryption::EncryptionSettings,
     ruma::{
+        RoomId,
         api::client::{account::register::v3::Request as RegistrationRequest, uiaa},
         time::Instant,
-        RoomId,
     },
     sliding_sync::VersionBuilder,
     sync::SyncResponse,
     timeout::ElapsedError,
-    Client, ClientBuilder, Room,
 };
 use once_cell::sync::Lazy;
 use rand::Rng as _;
-use tempfile::{tempdir, TempDir};
+use tempfile::{TempDir, tempdir};
 use tokio::{sync::Mutex, time::sleep};
 
 /// This global maintains temp directories alive for the whole lifetime of the
@@ -47,7 +47,7 @@ pub struct TestClientBuilder {
 
 impl TestClientBuilder {
     pub fn new(username: impl AsRef<str>) -> Self {
-        let suffix: u128 = rand::thread_rng().gen();
+        let suffix: u128 = rand::thread_rng().r#gen();
         let randomized_username = format!("{}{}", username.as_ref(), suffix);
         Self::with_exact_username(randomized_username)
     }

testing/matrix-sdk-integration-testing/src/tests/e2ee/mod.rs

@@ -8,31 +8,30 @@ use assert_matches::assert_matches;
 use assert_matches2::assert_let;
 use assign::assign;
 use matrix_sdk::{
-    assert_next_eq_with_timeout,
-    crypto::{format_emojis, SasState},
+    Client, assert_next_eq_with_timeout,
+    crypto::{SasState, format_emojis},
     encryption::{
+        BackupDownloadStrategy, EncryptionSettings, LocalTrust,
         backups::BackupState,
         recovery::{Recovery, RecoveryState},
         verification::{
             QrVerificationData, QrVerificationState, Verification, VerificationRequestState,
         },
-        BackupDownloadStrategy, EncryptionSettings, LocalTrust,
     },
     ruma::{
+        OwnedEventId,
         api::client::room::create_room::v3::Request as CreateRoomRequest,
         events::{
-            key::verification::{request::ToDeviceKeyVerificationRequestEvent, VerificationMethod},
+            GlobalAccountDataEventType, OriginalSyncMessageLikeEvent,
+            key::verification::{VerificationMethod, request::ToDeviceKeyVerificationRequestEvent},
             room::message::{
                 MessageType, OriginalSyncRoomMessageEvent, RoomMessageEventContent,
                 SyncRoomMessageEvent,
             },
             secret_storage::secret::SecretEventContent,
-            GlobalAccountDataEventType, OriginalSyncMessageLikeEvent,
         },
-        OwnedEventId,
     },
     timeout::timeout,
-    Client,
 };
 use matrix_sdk_ui::{
     notification_client::{NotificationClient, NotificationProcessSetup},
@@ -51,8 +50,8 @@ mod shared_history;
 // processed twice, meaning incorrect verification states will be found and the
 // process will fail, especially with user verification.
 #[tokio::test(flavor = "multi_thread", worker_threads = 4)]
-async fn test_mutual_sas_verification_with_notification_client_ignores_verification_events(
-) -> Result<()> {
+async fn test_mutual_sas_verification_with_notification_client_ignores_verification_events()
+-> Result<()> {
     let encryption_settings =
         EncryptionSettings { auto_enable_cross_signing: true, ..Default::default() };
     let alice = TestClientBuilder::new("alice")

testing/matrix-sdk-integration-testing/src/tests/e2ee/shared_history.rs

@@ -3,7 +3,7 @@ use std::ops::Deref;
 use anyhow::Result;
 use assert_matches2::assert_let;
 use assign::assign;
-use futures::{pin_mut, FutureExt, StreamExt};
+use futures::{FutureExt, StreamExt, pin_mut};
 use matrix_sdk::{
     assert_decrypted_message_eq,
     encryption::EncryptionSettings,
@@ -15,7 +15,7 @@ use matrix_sdk::{
 use matrix_sdk_common::deserialized_responses::ProcessedToDeviceEvent;
 use matrix_sdk_ui::sync_service::SyncService;
 use similar_asserts::assert_eq;
-use tracing::{info, Instrument};
+use tracing::{Instrument, info};
 
 use crate::helpers::{SyncTokenAwareClient, TestClientBuilder};
 

testing/matrix-sdk-integration-testing/src/tests/invitations.rs

@@ -1,7 +1,7 @@
-use anyhow::{ensure, Result};
+use anyhow::{Result, ensure};
 use assign::assign;
 use matrix_sdk::{
-    ruma::api::client::room::create_room::v3::Request as CreateRoomRequest, RoomState,
+    RoomState, ruma::api::client::room::create_room::v3::Request as CreateRoomRequest,
 };
 
 use crate::helpers::TestClientBuilder;

testing/matrix-sdk-integration-testing/src/tests/nse.rs

@@ -8,22 +8,22 @@ use anyhow::Result;
 use assign::assign;
 use futures::Future;
 use matrix_sdk::{
+    Client, Room,
     encryption::EncryptionSettings,
     ruma::{
+        EventEncryptionAlgorithm, OwnedEventId, OwnedRoomId, RoomId,
         api::client::room::create_room::v3::Request as CreateRoomRequest,
         events::{
+            AnyMessageLikeEventContent, AnySyncTimelineEvent, OriginalSyncMessageLikeEvent,
             room::{
                 encrypted::{OriginalSyncRoomEncryptedEvent, RoomEncryptedEventContent},
                 encryption::RoomEncryptionEventContent,
                 message::{MessageType, OriginalSyncRoomMessageEvent, RoomMessageEventContent},
             },
             room_key::ToDeviceRoomKeyEvent,
-            AnyMessageLikeEventContent, AnySyncTimelineEvent, OriginalSyncMessageLikeEvent,
         },
         serde::Raw,
-        EventEncryptionAlgorithm, OwnedEventId, OwnedRoomId, RoomId,
     },
-    Client, Room,
 };
 use matrix_sdk_ui::{
     notification_client::{
@@ -33,7 +33,7 @@ use matrix_sdk_ui::{
 };
 use serde_json::json;
 use tempfile::tempdir;
-use tracing::{info, instrument, span, Level};
+use tracing::{Level, info, instrument, span};
 
 use crate::helpers::{SyncTokenAwareClient, TestClientBuilder};
 

testing/matrix-sdk-integration-testing/src/tests/redaction.rs

@@ -2,15 +2,15 @@ use anyhow::Result;
 use assert_matches::assert_matches;
 use assign::assign;
 use matrix_sdk::{
+    Client,
     config::SyncSettings,
     ruma::{
         api::client::room::create_room::v3::Request as CreateRoomRequest,
         events::{
-            room::name::{RoomNameEventContent, SyncRoomNameEvent},
             AnySyncStateEvent, StateEventType,
+            room::name::{RoomNameEventContent, SyncRoomNameEvent},
         },
     },
-    Client,
 };
 
 use crate::helpers::TestClientBuilder;

testing/matrix-sdk-integration-testing/src/tests/repeated_join.rs

@@ -3,12 +3,12 @@ use std::{sync::Arc, time::Duration};
 use anyhow::Result;
 use assign::assign;
 use matrix_sdk::{
+    Client, Room, RoomMemberships, RoomState, StateStoreExt,
     event_handler::Ctx,
     ruma::{
         api::client::room::create_room::v3::Request as CreateRoomRequest,
         events::room::member::{MembershipState, StrippedRoomMemberEvent},
     },
-    Client, Room, RoomMemberships, RoomState, StateStoreExt,
 };
 use matrix_sdk_common::executor::spawn;
 use tokio::sync::Notify;

testing/matrix-sdk-integration-testing/src/tests/room.rs

@@ -3,24 +3,24 @@ use std::time::Duration;
 use anyhow::Result;
 use assert_matches2::{assert_let, assert_matches};
 use matrix_sdk::{
+    RoomState,
     room::MessagesOptions,
     ruma::{
         api::client::room::create_room::v3::Request as CreateRoomRequest,
         assign, event_id, events,
         events::{
-            room::message::RoomMessageEventContent, AnyRoomAccountDataEventContent,
-            AnySyncStateEvent, AnySyncTimelineEvent, EventContent,
+            AnyRoomAccountDataEventContent, AnySyncStateEvent, AnySyncTimelineEvent, EventContent,
+            room::message::RoomMessageEventContent,
         },
         serde::Raw,
         uint,
     },
     test_utils::assert_event_matches_msg,
-    RoomState,
 };
 use tokio::{spawn, time::sleep};
 use tracing::error;
 
-use crate::helpers::{wait_for_room, TestClientBuilder};
+use crate::helpers::{TestClientBuilder, wait_for_room};
 
 #[tokio::test]
 async fn test_event_with_context() -> Result<()> {

testing/matrix-sdk-integration-testing/src/tests/room_directory_search.rs

@@ -21,9 +21,9 @@ use eyeball_im::VectorDiff;
 use futures::StreamExt;
 use matrix_sdk::{
     room_directory_search::RoomDirectorySearch,
-    ruma::api::client::room::{create_room::v3::Request as CreateRoomRequest, Visibility},
+    ruma::api::client::room::{Visibility, create_room::v3::Request as CreateRoomRequest},
 };
-use rand::{thread_rng, Rng};
+use rand::{Rng, thread_rng};
 use stream_assert::assert_pending;
 use tokio::time::sleep;
 use tracing::warn;