Fix formatting.

Signed-off-by: Jonas Zohren <git-pbkyr@jzohren.de>

src/database.rs

@@ -1,3 +1,4 @@
+use std::hash::Hash;
 use std::{
     collections::{BTreeMap, HashMap, HashSet},
     convert::{TryFrom, TryInto},
@@ -8,13 +9,12 @@ use std::{
     path::Path,
     sync::{Arc, Mutex, RwLock},
 };
-use std::hash::Hash;
 
 use directories::ProjectDirs;
 use lru_cache::LruCache;
 use rocket::{
     futures::{channel::mpsc, stream::FuturesUnordered, StreamExt},
-    outcome::{IntoOutcome, try_outcome},
+    outcome::{try_outcome, IntoOutcome},
     request::{FromRequest, Request},
     Shutdown, State,
 };
@@ -25,7 +25,7 @@ use tracing::{debug, error, warn};
 
 use abstraction::DatabaseEngine;
 
-use crate::{Error, Result, utils};
+use crate::{utils, Error, Result};
 
 use self::proxy::ProxyConfig;
 
@@ -916,8 +916,7 @@ impl Database {
                     _ = s.recv() => {
                         info!("wal-trunc: Received SIGHUP");
                     }
-                }
+                };
-                ;
                 #[cfg(not(unix))]
                 {
                     i.tick().await;
@@ -936,7 +935,9 @@ impl Database {
 
     /// Measures memory usage in bytes and how full the caches are in percent for all caches in the Database struct.
     pub fn get_cache_usage(&mut self) -> Result<CacheUsageStatistics> {
-        fn memory_usage_of_locked_cache<K: Eq + Hash, V>(cache: &mut Mutex<LruCache<K, V>>) -> usize {
+        fn memory_usage_of_locked_cache<K: Eq + Hash, V>(
+            cache: &mut Mutex<LruCache<K, V>>,
+        ) -> usize {
             let raw_cache = cache.lock().unwrap();
             let mut cache_items_size_sum: usize = 0;
             for cache_item in raw_cache.iter() {
@@ -953,42 +954,41 @@ impl Database {
             cache.lock().unwrap().capacity()
         }
 
-        return
+        return Ok(CacheUsageStatistics {
-            Ok(CacheUsageStatistics {
             pdu_cache: (
                 memory_usage_of_locked_cache(&mut self.rooms.pdu_cache),
                 items_in_locked_cache(&mut self.rooms.pdu_cache),
-                    capacity_of_locked_cache(&mut self.rooms.pdu_cache)
+                capacity_of_locked_cache(&mut self.rooms.pdu_cache),
             ),
             auth_chain_cache: (
                 memory_usage_of_locked_cache(&mut self.rooms.auth_chain_cache),
                 items_in_locked_cache(&mut self.rooms.auth_chain_cache),
-                    capacity_of_locked_cache(&mut self.rooms.auth_chain_cache)
+                capacity_of_locked_cache(&mut self.rooms.auth_chain_cache),
             ),
             shorteventid_cache: (
                 memory_usage_of_locked_cache(&mut self.rooms.shorteventid_cache),
                 items_in_locked_cache(&mut self.rooms.shorteventid_cache),
-                    capacity_of_locked_cache(&mut self.rooms.shorteventid_cache)
+                capacity_of_locked_cache(&mut self.rooms.shorteventid_cache),
             ),
             eventidshort_cache: (
                 memory_usage_of_locked_cache(&mut self.rooms.eventidshort_cache),
                 items_in_locked_cache(&mut self.rooms.eventidshort_cache),
-                    capacity_of_locked_cache(&mut self.rooms.eventidshort_cache)
+                capacity_of_locked_cache(&mut self.rooms.eventidshort_cache),
             ),
             statekeyshort_cache: (
                 memory_usage_of_locked_cache(&mut self.rooms.statekeyshort_cache),
                 items_in_locked_cache(&mut self.rooms.statekeyshort_cache),
-                    capacity_of_locked_cache(&mut self.rooms.statekeyshort_cache)
+                capacity_of_locked_cache(&mut self.rooms.statekeyshort_cache),
             ),
             shortstatekey_cache: (
                 memory_usage_of_locked_cache(&mut self.rooms.shortstatekey_cache),
                 items_in_locked_cache(&mut self.rooms.shortstatekey_cache),
-                    capacity_of_locked_cache(&mut self.rooms.shortstatekey_cache)
+                capacity_of_locked_cache(&mut self.rooms.shortstatekey_cache),
             ),
             stateinfo_cache: (
                 memory_usage_of_locked_cache(&mut self.rooms.stateinfo_cache),
                 items_in_locked_cache(&mut self.rooms.stateinfo_cache),
-                    capacity_of_locked_cache(&mut self.rooms.stateinfo_cache)
+                capacity_of_locked_cache(&mut self.rooms.stateinfo_cache),
             ),
         });
     }

src/database/admin.rs

@@ -5,13 +5,13 @@ use std::{
 
 use rocket::futures::{channel::mpsc, stream::StreamExt};
 use ruma::{
-    events::{EventType, room::message},
+    events::{room::message, EventType},
     UserId,
 };
 use tokio::sync::{MutexGuard, RwLock, RwLockWriteGuard};
 use tracing::warn;
 
-use crate::{Database, pdu::PduBuilder};
+use crate::{pdu::PduBuilder, Database};
 
 pub enum AdminCommand {
     RegisterAppservice(serde_yaml::Value),

src/database/rooms.rs

@@ -12,24 +12,24 @@ use ring::digest;
 use rocket::http::RawStr;
 use ruma::{
     api::{client::error::ErrorKind, federation},
-    EventId,
     events::{
-        AnyStrippedStateEvent, AnySyncStateEvent,
+        ignored_user_list, push_rules,
-        EventType,
+        room::{
-        ignored_user_list, push_rules, room::{
             create::CreateEventContent, member, message, power_levels::PowerLevelsEventContent,
         },
+        AnyStrippedStateEvent, AnySyncStateEvent, EventType,
     },
     push::{self, Action, Tweak},
-    RoomAliasId,
+    serde::{CanonicalJsonObject, CanonicalJsonValue, Raw},
-    RoomId, RoomVersionId, serde::{CanonicalJsonObject, CanonicalJsonValue, Raw}, ServerName, state_res::{self, RoomVersion, StateMap}, uint, UserId,
+    state_res::{self, RoomVersion, StateMap},
+    uint, EventId, RoomAliasId, RoomId, RoomVersionId, ServerName, UserId,
 };
 use tokio::sync::MutexGuard;
 use tracing::{error, warn};
 
 pub use edus::RoomEdus;
 
-use crate::{Database, Error, pdu::PduBuilder, PduEvent, Result, utils};
+use crate::{pdu::PduBuilder, utils, Database, Error, PduEvent, Result};
 
 use super::{abstraction::Tree, admin::AdminCommand, pusher};