From cccad6104cabc082a79a334edd98c7df4ee58c3d Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Thu, 24 Feb 2022 15:18:16 +0100 Subject: [PATCH] fixing formatting --- crates/matrix-sdk-crypto/src/identities/manager.rs | 8 +++----- crates/matrix-sdk-crypto/src/identities/user.rs | 2 +- crates/matrix-sdk-indexeddb/src/cryptostore.rs | 2 +- crates/matrix-sdk-indexeddb/src/lib.rs | 2 +- crates/matrix-sdk-indexeddb/src/state_store.rs | 2 +- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/crates/matrix-sdk-crypto/src/identities/manager.rs b/crates/matrix-sdk-crypto/src/identities/manager.rs index 75171cc64..ea9e130e3 100644 --- a/crates/matrix-sdk-crypto/src/identities/manager.rs +++ b/crates/matrix-sdk-crypto/src/identities/manager.rs @@ -545,7 +545,7 @@ pub(crate) mod testing { use matrix_sdk_common::locks::Mutex; use ruma::{ api::{client::r0::keys::get_keys::Response as KeyQueryResponse, IncomingResponse}, - DeviceId, UserId, device_id, user_id, + device_id, user_id, DeviceId, UserId, }; use serde_json::json; @@ -746,10 +746,8 @@ pub(crate) mod testing { pub(crate) mod test { use matrix_sdk_test::async_test; - use super::testing::{manager, device_id, other_key_query, other_user_id}; - use ruma::{ - DeviceId, UserId, device_id, user_id, - }; + use super::testing::{device_id, manager, other_key_query, other_user_id}; + use ruma::{device_id, user_id, DeviceId, UserId}; #[async_test] async fn test_manager_creation() { diff --git a/crates/matrix-sdk-crypto/src/identities/user.rs b/crates/matrix-sdk-crypto/src/identities/user.rs index 3d128e218..e1686fe59 100644 --- a/crates/matrix-sdk-crypto/src/identities/user.rs +++ b/crates/matrix-sdk-crypto/src/identities/user.rs @@ -989,7 +989,7 @@ pub(crate) mod test { use matrix_sdk_test::async_test; use ruma::{api::client::r0::keys::get_keys::Response as KeyQueryResponse, user_id}; - use super::testing::{get_other_identity, get_own_identity, device}; + use super::testing::{device, get_other_identity, get_own_identity}; use super::{ReadOnlyOwnUserIdentity, ReadOnlyUserIdentities, ReadOnlyUserIdentity}; use crate::{ identities::{ diff --git a/crates/matrix-sdk-indexeddb/src/cryptostore.rs b/crates/matrix-sdk-indexeddb/src/cryptostore.rs index 573592f9c..658f85fd1 100644 --- a/crates/matrix-sdk-indexeddb/src/cryptostore.rs +++ b/crates/matrix-sdk-indexeddb/src/cryptostore.rs @@ -18,6 +18,7 @@ use std::{ sync::{Arc, RwLock}, }; +use crate::safe_encode::SafeEncode; use dashmap::DashSet; use indexed_db_futures::prelude::*; use matrix_sdk_common::{ @@ -25,7 +26,6 @@ use matrix_sdk_common::{ locks::Mutex, ruma::{DeviceId, RoomId, TransactionId, UserId}, }; -use crate::safe_encode::SafeEncode; use wasm_bindgen::JsValue; use anyhow::anyhow; diff --git a/crates/matrix-sdk-indexeddb/src/lib.rs b/crates/matrix-sdk-indexeddb/src/lib.rs index 787cbf5b2..8b3722862 100644 --- a/crates/matrix-sdk-indexeddb/src/lib.rs +++ b/crates/matrix-sdk-indexeddb/src/lib.rs @@ -12,4 +12,4 @@ mod cryptostore; pub use cryptostore::IndexeddbStore as CryptoStore; #[cfg(target_arch = "wasm32")] -pub use state_store::IndexeddbStore as StateStore; \ No newline at end of file +pub use state_store::IndexeddbStore as StateStore; diff --git a/crates/matrix-sdk-indexeddb/src/state_store.rs b/crates/matrix-sdk-indexeddb/src/state_store.rs index 010af7028..bbdcc354f 100644 --- a/crates/matrix-sdk-indexeddb/src/state_store.rs +++ b/crates/matrix-sdk-indexeddb/src/state_store.rs @@ -14,6 +14,7 @@ use std::collections::BTreeSet; +use crate::safe_encode::SafeEncode; use futures_util::stream; use indexed_db_futures::prelude::*; use matrix_sdk_common::{ @@ -31,7 +32,6 @@ use matrix_sdk_common::{ EventId, MxcUri, RoomId, RoomVersionId, UserId, }, }; -use crate::safe_encode::SafeEncode; use serde::{Deserialize, Serialize}; use tracing::{info, warn}; use wasm_bindgen::JsValue;