From d4087a1aaee9b93f554e697a62305c689aae206f Mon Sep 17 00:00:00 2001 From: Marcel Date: Wed, 17 Jun 2020 19:16:04 +0200 Subject: [PATCH] Fix cargo fmt issues that the local version didn't auto fix --- matrix_sdk_base/src/client.rs | 2 +- matrix_sdk_base/src/event_emitter/mod.rs | 2 +- matrix_sdk_crypto/src/store/mod.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/matrix_sdk_base/src/client.rs b/matrix_sdk_base/src/client.rs index 3b5d53cc..dabdeab4 100644 --- a/matrix_sdk_base/src/client.rs +++ b/matrix_sdk_base/src/client.rs @@ -1767,8 +1767,8 @@ mod test { events::{collections::all::RoomEvent, stripped::AnyStrippedStateEvent}, BaseClient, Session, }; - use matrix_sdk_test::{async_test, EventBuilder, EventsFile}; use matrix_sdk_common_macros::async_trait; + use matrix_sdk_test::{async_test, EventBuilder, EventsFile}; use serde_json::json; use std::convert::TryFrom; diff --git a/matrix_sdk_base/src/event_emitter/mod.rs b/matrix_sdk_base/src/event_emitter/mod.rs index d386d9a6..de42e4ad 100644 --- a/matrix_sdk_base/src/event_emitter/mod.rs +++ b/matrix_sdk_base/src/event_emitter/mod.rs @@ -202,9 +202,9 @@ pub trait EventEmitter: Send + Sync { mod test { use super::*; use matrix_sdk_common::locks::Mutex; + use matrix_sdk_common_macros::async_trait; use matrix_sdk_test::{async_test, sync_response, SyncResponseFile}; use std::sync::Arc; - use matrix_sdk_common_macros::async_trait; #[cfg(target_arch = "wasm32")] pub use wasm_bindgen_test::*; diff --git a/matrix_sdk_crypto/src/store/mod.rs b/matrix_sdk_crypto/src/store/mod.rs index d0231490..91be9598 100644 --- a/matrix_sdk_crypto/src/store/mod.rs +++ b/matrix_sdk_crypto/src/store/mod.rs @@ -27,8 +27,8 @@ use super::device::Device; use super::memory_stores::UserDevices; use super::olm::{Account, InboundGroupSession, Session}; use matrix_sdk_common::identifiers::{DeviceId, RoomId, UserId}; -use olm_rs::errors::{OlmAccountError, OlmGroupSessionError, OlmSessionError}; use matrix_sdk_common_macros::send_sync; +use olm_rs::errors::{OlmAccountError, OlmGroupSessionError, OlmSessionError}; pub mod memorystore;