diff --git a/Cargo.lock b/Cargo.lock index 8d68133bc7f..b115e7ee9ad 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3482,7 +3482,7 @@ dependencies = [ [[package]] name = "matrix-sdk-qrcode" -version = "0.7.0" +version = "0.7.1" dependencies = [ "byteorder", "image", @@ -3494,7 +3494,7 @@ dependencies = [ [[package]] name = "matrix-sdk-sqlite" -version = "0.7.0" +version = "0.7.1" dependencies = [ "assert_matches", "async-trait", diff --git a/crates/matrix-sdk-base/src/store/integration_tests.rs b/crates/matrix-sdk-base/src/store/integration_tests.rs index f844996883c..f0100881f0a 100644 --- a/crates/matrix-sdk-base/src/store/integration_tests.rs +++ b/crates/matrix-sdk-base/src/store/integration_tests.rs @@ -1,5 +1,10 @@ //! Trait and macro of integration tests for StateStore implementations. +use std::{ + collections::{BTreeMap, BTreeSet}, + time::Duration, +}; + use assert_matches::assert_matches; use assert_matches2::assert_let; use async_trait::async_trait; @@ -32,8 +37,6 @@ use ruma::{ uint, user_id, EventId, OwnedEventId, OwnedUserId, RoomId, TransactionId, UserId, }; use serde_json::{json, value::Value as JsonValue}; -use std::collections::{BTreeMap, BTreeSet}; -use std::time::Duration; use super::{DynStateStore, ServerCapabilities}; use crate::{ diff --git a/crates/matrix-sdk/src/room/mod.rs b/crates/matrix-sdk/src/room/mod.rs index ac2a4fc47f9..223e6f251bd 100644 --- a/crates/matrix-sdk/src/room/mod.rs +++ b/crates/matrix-sdk/src/room/mod.rs @@ -92,14 +92,13 @@ pub use self::{ member::{RoomMember, RoomMemberRole}, messages::{EventWithContextResponse, Messages, MessagesOptions}, }; -use crate::error::BeaconError; #[cfg(doc)] use crate::event_cache::EventCache; use crate::{ attachment::AttachmentConfig, client::WeakClient, config::RequestConfig, - error::WrongRoomState, + error::{BeaconError, WrongRoomState}, event_cache::{self, EventCacheDropHandles, RoomEventCache}, event_handler::{EventHandler, EventHandlerDropGuard, EventHandlerHandle, SyncEvent}, media::{MediaFormat, MediaRequest}, @@ -2674,12 +2673,14 @@ impl Room { /// /// # Arguments /// - /// * `duration_millis` - The duration for which the live location is shared, in milliseconds. + /// * `duration_millis` - The duration for which the live location is + /// shared, in milliseconds. /// * `description` - An optional description for the live location share. /// /// # Errors /// - /// Returns an error if the room is not joined or if the state event could not be sent. + /// Returns an error if the room is not joined or if the state event could + /// not be sent. pub async fn start_live_location_share( &self, duration_millis: u64, diff --git a/crates/matrix-sdk/tests/integration/room/joined.rs b/crates/matrix-sdk/tests/integration/room/joined.rs index 27d095fa7c5..da415fbc94d 100644 --- a/crates/matrix-sdk/tests/integration/room/joined.rs +++ b/crates/matrix-sdk/tests/integration/room/joined.rs @@ -3,7 +3,6 @@ use std::{ time::Duration, }; -use crate::{logged_in_client_with_server, mock_encryption_state, mock_sync, synced_client}; use futures_util::future::join_all; use matrix_sdk::{ config::SyncSettings, @@ -28,6 +27,8 @@ use wiremock::{ Mock, ResponseTemplate, }; +use crate::{logged_in_client_with_server, mock_encryption_state, mock_sync, synced_client}; + #[async_test] async fn test_invite_user_by_id() { let (client, server) = logged_in_client_with_server().await;