From 0067a4cbcb76b413bd8ea2c403c0e65f36980514 Mon Sep 17 00:00:00 2001 From: Peter Tripp Date: Tue, 12 May 2026 15:03:31 -0400 Subject: [PATCH] Update to Rust 2024 edition --- microbot/Cargo.toml | 2 +- microbot/src/lib.rs | 8 ++++---- microbot/src/message.rs | 2 +- test-utils/Cargo.toml | 2 +- test-utils/src/lib.rs | 8 +++----- tests/Cargo.toml | 2 +- tests/tests/bot_conversation.rs | 22 +++++++++++++--------- tests/tests/ignore_old_messages.rs | 2 +- tests/tests/receives_command.rs | 2 +- 9 files changed, 26 insertions(+), 24 deletions(-) diff --git a/microbot/Cargo.toml b/microbot/Cargo.toml index ac5fb2c..af6e64f 100644 --- a/microbot/Cargo.toml +++ b/microbot/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "microbot" version = "0.1.0" -edition = "2021" +edition = "2024" [dependencies] futures = { workspace = true } diff --git a/microbot/src/lib.rs b/microbot/src/lib.rs index 0c26b7b..1384fc2 100644 --- a/microbot/src/lib.rs +++ b/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::{ diff --git a/microbot/src/message.rs b/microbot/src/message.rs index 143330f..7ab54d9 100644 --- a/microbot/src/message.rs +++ b/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; diff --git a/test-utils/Cargo.toml b/test-utils/Cargo.toml index a8a3052..fd36fa6 100644 --- a/test-utils/Cargo.toml +++ b/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 } diff --git a/test-utils/src/lib.rs b/test-utils/src/lib.rs index 03014de..37e3327 100644 --- a/test-utils/src/lib.rs +++ b/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] diff --git a/tests/Cargo.toml b/tests/Cargo.toml index 38886cc..e084c87 100644 --- a/tests/Cargo.toml +++ b/tests/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "tests" version = "0.1.0" -edition = "2021" +edition = "2024" [dependencies] matrix-sdk = { workspace = true } diff --git a/tests/tests/bot_conversation.rs b/tests/tests/bot_conversation.rs index 296973e..4bbf108 100644 --- a/tests/tests/bot_conversation.rs +++ b/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(); diff --git a/tests/tests/ignore_old_messages.rs b/tests/tests/ignore_old_messages.rs index a61f146..a5baec4 100644 --- a/tests/tests/ignore_old_messages.rs +++ b/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; diff --git a/tests/tests/receives_command.rs b/tests/tests/receives_command.rs index 7b001d3..41ce789 100644 --- a/tests/tests/receives_command.rs +++ b/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;