Skip to content

Commit

Permalink
style: fix cargo fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
torrybr committed Jul 19, 2024
1 parent 15e23de commit 2f4abd2
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 9 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions crates/matrix-sdk-base/src/store/integration_tests.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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::{
Expand Down
9 changes: 5 additions & 4 deletions crates/matrix-sdk/src/room/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down Expand Up @@ -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,
Expand Down
3 changes: 2 additions & 1 deletion crates/matrix-sdk/tests/integration/room/joined.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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;
Expand Down

0 comments on commit 2f4abd2

Please sign in to comment.