cargo fmt

src/database/key_value/account_data.rs

@@ -1,12 +1,12 @@
 use std::collections::HashMap;
 
 use ruma::{
-    api::client::{error::ErrorKind},
+    api::client::error::ErrorKind,
     events::{AnyEphemeralRoomEvent, RoomAccountDataEventType},
-    serde::Raw, RoomId, UserId,
+    serde::Raw,
+    RoomId, UserId,
 };
 
-
 use crate::{database::KeyValueDatabase, service, services, utils, Error, Result};
 
 impl service::account_data::Data for KeyValueDatabase {

src/database/key_value/pusher.rs

@@ -3,7 +3,7 @@ use ruma::{
     UserId,
 };
 
-use crate::{database::KeyValueDatabase, service, Error, Result, utils};
+use crate::{database::KeyValueDatabase, service, utils, Error, Result};
 
 impl service::pusher::Data for KeyValueDatabase {
     fn set_pusher(&self, sender: &UserId, pusher: set_pusher::v3::Pusher) -> Result<()> {
@@ -28,7 +28,11 @@ impl service::pusher::Data for KeyValueDatabase {
         Ok(())
     }
 
-    fn get_pusher(&self, sender: &UserId, pushkey: &str) -> Result<Option<get_pushers::v3::Pusher>> {
+    fn get_pusher(
+        &self,
+        sender: &UserId,
+        pushkey: &str,
+    ) -> Result<Option<get_pushers::v3::Pusher>> {
         let mut senderkey = sender.as_bytes().to_vec();
         senderkey.push(0xff);
         senderkey.extend_from_slice(pushkey.as_bytes());
@@ -55,15 +59,21 @@ impl service::pusher::Data for KeyValueDatabase {
             .collect()
     }
 
-    fn get_pushkeys<'a>(&'a self, sender: &UserId) -> Box<dyn Iterator<Item = Result<String>> + 'a> {
+    fn get_pushkeys<'a>(
+        &'a self,
+        sender: &UserId,
+    ) -> Box<dyn Iterator<Item = Result<String>> + 'a> {
         let mut prefix = sender.as_bytes().to_vec();
         prefix.push(0xff);
 
         Box::new(self.senderkey_pusher.scan_prefix(prefix).map(|(k, _)| {
             let mut parts = k.splitn(2, |&b| b == 0xff);
             let _senderkey = parts.next();
-            let push_key = parts.next().ok_or_else(|| Error::bad_database("Invalid senderkey_pusher in db"))?;
-            let push_key_string = utils::string_from_bytes(push_key).map_err(|_| Error::bad_database("Invalid pusher bytes in senderkey_pusher"))?;
+            let push_key = parts
+                .next()
+                .ok_or_else(|| Error::bad_database("Invalid senderkey_pusher in db"))?;
+            let push_key_string = utils::string_from_bytes(push_key)
+                .map_err(|_| Error::bad_database("Invalid pusher bytes in senderkey_pusher"))?;
 
             Ok(push_key_string)
         }))

src/database/key_value/rooms/edus/read_receipt.rs

@@ -54,12 +54,12 @@ impl service::rooms::edus::read_receipt::Data for KeyValueDatabase {
         since: u64,
     ) -> Box<
         dyn Iterator<
-            Item = Result<(
-                Box<UserId>,
-                u64,
-                Raw<ruma::events::AnySyncEphemeralRoomEvent>,
-            )>,
-        > + 'a,
+                Item = Result<(
+                    Box<UserId>,
+                    u64,
+                    Raw<ruma::events::AnySyncEphemeralRoomEvent>,
+                )>,
+            > + 'a,
     > {
         let mut prefix = room_id.as_bytes().to_vec();
         prefix.push(0xff);

src/database/key_value/rooms/metadata.rs

@@ -1,6 +1,6 @@
 use ruma::RoomId;
 
-use crate::{database::KeyValueDatabase, service, services, Result, utils, Error};
+use crate::{database::KeyValueDatabase, service, services, utils, Error, Result};
 
 impl service::rooms::metadata::Data for KeyValueDatabase {
     fn exists(&self, room_id: &RoomId) -> Result<bool> {
@@ -27,7 +27,6 @@ impl service::rooms::metadata::Data for KeyValueDatabase {
             )
             .map_err(|_| Error::bad_database("Room ID in roomid_shortroomid is invalid."))
         }))
-
     }
 
     fn is_disabled(&self, room_id: &RoomId) -> Result<bool> {

src/database/key_value/rooms/search.rs

@@ -26,7 +26,7 @@ impl service::rooms::search::Data for KeyValueDatabase {
         &'a self,
         room_id: &RoomId,
         search_string: &str,
-    ) -> Result<Option<(Box<dyn Iterator<Item = Vec<u8>>+ 'a>, Vec<String>)>> {
+    ) -> Result<Option<(Box<dyn Iterator<Item = Vec<u8>> + 'a>, Vec<String>)>> {
         let prefix = services()
             .rooms
             .short

src/database/key_value/users.rs

@@ -5,8 +5,7 @@ use ruma::{
     encryption::{CrossSigningKey, DeviceKeys, OneTimeKey},
     events::{AnyToDeviceEvent, StateEventType},
     serde::Raw,
-    DeviceId, DeviceKeyAlgorithm, DeviceKeyId, MilliSecondsSinceUnixEpoch, MxcUri,
-    UInt, UserId,
+    DeviceId, DeviceKeyAlgorithm, DeviceKeyId, MilliSecondsSinceUnixEpoch, MxcUri, UInt, UserId,
 };
 use tracing::warn;
 
@@ -956,4 +955,3 @@ fn get_username_with_valid_password(username: &[u8], password: &[u8]) -> Option<
         }
     }
 }
-

src/database/mod.rs

@@ -2,15 +2,13 @@ pub mod abstraction;
 pub mod key_value;
 
 use crate::{
-    service::{
-        rooms::{state_compressor::CompressedStateEvent},
-    },
-    services, utils, Config, Error, PduEvent, Result, Services, SERVICES,
+    service::rooms::state_compressor::CompressedStateEvent, services, utils, Config, Error,
+    PduEvent, Result, Services, SERVICES,
 };
 use abstraction::KeyValueDatabaseEngine;
 use abstraction::KvTree;
 use directories::ProjectDirs;
-use futures_util::{StreamExt};
+use futures_util::StreamExt;
 use lru_cache::LruCache;
 use ruma::{
     events::{
@@ -29,7 +27,7 @@ use std::{
     path::Path,
     sync::{Arc, Mutex, RwLock},
 };
-use tokio::sync::{mpsc};
+use tokio::sync::mpsc;
 use tracing::{debug, error, info, warn};
 
 pub struct KeyValueDatabase {