Update to Rust 2024 edition

Author: notpeter

microbot/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "microbot"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 futures = { workspace = true }

microbot/src/lib.rs

@@ -4,19 +4,19 @@
 
 use command::CommandHandlers;
 use context::MessengerContext;
-use futures::{future::BoxFuture, TryFutureExt};
+use futures::{TryFutureExt, future::BoxFuture};
 use http::Extensions;
 use matrix_sdk::{
-    config::SyncSettings, event_handler::Ctx, Client, ClientBuildError, LoopCtrl, Room, RoomState,
+    Client, ClientBuildError, LoopCtrl, Room, RoomState, config::SyncSettings, event_handler::Ctx,
 };
 use message::{CommandMessageParser, IntoCommand};
 use ruma::{
+    OwnedUserId,
     api::client::{filter::FilterDefinition, sync::sync_events::v3::Filter as SyncFilter},
     events::{
-        room::{member::PossiblyRedactedRoomMemberEventContent, message::RoomMessageEventContent},
         MessageLikeEventContent, OriginalSyncMessageLikeEvent, StrippedStateEvent,
+        room::{member::PossiblyRedactedRoomMemberEventContent, message::RoomMessageEventContent},
     },
-    OwnedUserId,
 };
 use serde::Deserialize;
 use std::{

microbot/src/message.rs

@@ -3,8 +3,8 @@
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 use matrix_sdk::ruma::{
-    events::room::message::{MessageType, OriginalSyncRoomMessageEvent, TextMessageEventContent},
     OwnedUserId,
+    events::room::message::{MessageType, OriginalSyncRoomMessageEvent, TextMessageEventContent},
 };
 use regex::Regex;
 

test-utils/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "microbot-test-utils"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 matrix-sdk = { workspace = true }

test-utils/src/lib.rs

@@ -3,18 +3,17 @@
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 use matrix_sdk::{
-    self,
+    self, Client, RoomState,
     config::SyncSettings,
     ruma::{
+        OwnedRoomId, OwnedUserId,
         api::client::{
             account::register::v3::Request as RegistrationRequest,
             room::create_room::v3::Request as CreateRoomRequest,
         },
         assign,
         events::room::message::RoomMessageEventContent,
-        OwnedRoomId, OwnedUserId,
     },
-    Client, RoomState,
 };
 use microbot::{MatrixMessenger, MatrixMessengerSignals};
 use ruma::api::{client::uiaa, error::ErrorKind};
@@ -29,9 +28,8 @@ pub struct TestSetup {
 
 pub async fn make_client(homeserver: &str) -> Client {
     let url = matrix_sdk::reqwest::Url::parse(homeserver).expect("Failed to parse homeserver url");
-    let client = Client::new(url).await.expect("Failed to construct client");
 
-    client
+    Client::new(url).await.expect("Failed to construct client")
 }
 
 #[instrument]

tests/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "tests"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 matrix-sdk = { workspace = true }

tests/tests/bot_conversation.rs

@@ -4,7 +4,7 @@
 
 use microbot::{CommandArgs, MatrixConfig, MatrixMessenger};
 use microbot_test_utils::{setup, spawn_bot};
-use rand::{distr::Alphanumeric, RngExt};
+use rand::{RngExt, distr::Alphanumeric};
 use ruma::events::room::message::RoomMessageEventContent;
 use tokio::sync::{
     mpsc,
@@ -153,14 +153,18 @@ async fn test_bot_conversation() {
 
         setup.send_cmd("start", "").await;
 
-        assert!(bot1_signal
-            .recv()
-            .await
-            .expect("Bot1 channel closed unexpectedly"));
-        assert!(bot2_signal
-            .recv()
-            .await
-            .expect("Bot2 channel closed unexpectedly"));
+        assert!(
+            bot1_signal
+                .recv()
+                .await
+                .expect("Bot1 channel closed unexpectedly")
+        );
+        assert!(
+            bot2_signal
+                .recv()
+                .await
+                .expect("Bot2 channel closed unexpectedly")
+        );
 
         handle1.abort();
         handle2.abort();

tests/tests/ignore_old_messages.rs

@@ -4,7 +4,7 @@
 
 use microbot::{CommandArgs, MatrixConfig, MatrixMessenger};
 use microbot_test_utils::{setup, spawn_bot};
-use rand::{distr::Alphanumeric, RngExt};
+use rand::{RngExt, distr::Alphanumeric};
 use tokio::sync::{mpsc, mpsc::Sender};
 use tracing_subscriber::filter::EnvFilter;
 

tests/tests/receives_command.rs

@@ -4,7 +4,7 @@
 
 use microbot::{CommandArgs, MatrixConfig, MatrixMessenger};
 use microbot_test_utils::{setup, spawn_bot};
-use rand::{distr::Alphanumeric, RngExt};
+use rand::{RngExt, distr::Alphanumeric};
 use tokio::sync::{mpsc, mpsc::Sender};
 use tracing_subscriber::filter::EnvFilter;