From 8c90e7adfb0d06164d17921e6e686cdaab0d8f1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20K=C3=B6sters?= <timo@koesters.xyz>
Date: Mon, 17 Jan 2022 14:39:37 +0100
Subject: [PATCH] refactor: fix warnings

---
 src/database/abstraction/rocksdb.rs | 27 ++++++---------------------
 src/database/sending.rs             |  6 ++++--
 src/database/transaction_ids.rs     |  2 +-
 src/server_server.rs                | 26 +++++++++++++-------------
 4 files changed, 24 insertions(+), 37 deletions(-)

diff --git a/src/database/abstraction/rocksdb.rs b/src/database/abstraction/rocksdb.rs
index 15ea9f73..d6157135 100644
--- a/src/database/abstraction/rocksdb.rs
+++ b/src/database/abstraction/rocksdb.rs
@@ -4,7 +4,6 @@ use std::{future::Future, pin::Pin, sync::Arc, sync::RwLock};
 
 pub struct Engine {
     rocks: rocksdb::DBWithThreadMode<rocksdb::MultiThreaded>,
-    cache_capacity_bytes: usize,
     max_open_files: i32,
     cache: rocksdb::Cache,
     old_cfs: Vec<String>,
@@ -17,11 +16,7 @@ pub struct RocksDbEngineTree<'a> {
     write_lock: RwLock<()>,
 }
 
-fn db_options(
-    cache_capacity_bytes: usize,
-    max_open_files: i32,
-    rocksdb_cache: &rocksdb::Cache,
-) -> rocksdb::Options {
+fn db_options(max_open_files: i32, rocksdb_cache: &rocksdb::Cache) -> rocksdb::Options {
     let mut block_based_options = rocksdb::BlockBasedOptions::default();
     block_based_options.set_block_cache(rocksdb_cache);
 
@@ -57,11 +52,7 @@ impl DatabaseEngine for Arc<Engine> {
         let cache_capacity_bytes = (config.db_cache_capacity_mb * 1024.0 * 1024.0) as usize;
         let rocksdb_cache = rocksdb::Cache::new_lru_cache(cache_capacity_bytes).unwrap();
 
-        let db_opts = db_options(
-            cache_capacity_bytes,
-            config.rocksdb_max_open_files,
-            &rocksdb_cache,
-        );
+        let db_opts = db_options(config.rocksdb_max_open_files, &rocksdb_cache);
 
         let cfs = rocksdb::DBWithThreadMode::<rocksdb::MultiThreaded>::list_cf(
             &db_opts,
@@ -75,18 +66,13 @@ impl DatabaseEngine for Arc<Engine> {
             cfs.iter().map(|name| {
                 rocksdb::ColumnFamilyDescriptor::new(
                     name,
-                    db_options(
-                        cache_capacity_bytes,
-                        config.rocksdb_max_open_files,
-                        &rocksdb_cache,
-                    ),
+                    db_options(config.rocksdb_max_open_files, &rocksdb_cache),
                 )
             }),
         )?;
 
         Ok(Arc::new(Engine {
             rocks: db,
-            cache_capacity_bytes,
             max_open_files: config.rocksdb_max_open_files,
             cache: rocksdb_cache,
             old_cfs: cfs,
@@ -96,10 +82,9 @@ impl DatabaseEngine for Arc<Engine> {
     fn open_tree(&self, name: &'static str) -> Result<Arc<dyn Tree>> {
         if !self.old_cfs.contains(&name.to_owned()) {
             // Create if it didn't exist
-            let _ = self.rocks.create_cf(
-                name,
-                &db_options(self.cache_capacity_bytes, self.max_open_files, &self.cache),
-            );
+            let _ = self
+                .rocks
+                .create_cf(name, &db_options(self.max_open_files, &self.cache));
         }
 
         Ok(Arc::new(RocksDbEngineTree {
diff --git a/src/database/sending.rs b/src/database/sending.rs
index 65284a4f..69f7c444 100644
--- a/src/database/sending.rs
+++ b/src/database/sending.rs
@@ -534,7 +534,8 @@ impl Sending {
                                     .collect::<Vec<_>>(),
                             ),
                             base64::URL_SAFE_NO_PAD,
-                        )).into(),
+                        ))
+                            .into(),
                     },
                 )
                 .await
@@ -692,7 +693,8 @@ impl Sending {
                                     .collect::<Vec<_>>(),
                             ),
                             base64::URL_SAFE_NO_PAD,
-                        )).into(),
+                        ))
+                            .into(),
                     },
                 )
                 .await
diff --git a/src/database/transaction_ids.rs b/src/database/transaction_ids.rs
index d576083a..12b838ba 100644
--- a/src/database/transaction_ids.rs
+++ b/src/database/transaction_ids.rs
@@ -1,7 +1,7 @@
 use std::sync::Arc;
 
 use crate::Result;
-use ruma::{DeviceId, UserId, identifiers::TransactionId};
+use ruma::{identifiers::TransactionId, DeviceId, UserId};
 
 use super::abstraction::Tree;
 
diff --git a/src/server_server.rs b/src/server_server.rs
index 5cd43d81..54ae0251 100644
--- a/src/server_server.rs
+++ b/src/server_server.rs
@@ -42,9 +42,9 @@ use ruma::{
     events::{
         receipt::{ReceiptEvent, ReceiptEventContent},
         room::{
-            server_acl::RoomServerAclEventContent,
             create::RoomCreateEventContent,
             member::{MembershipState, RoomMemberEventContent},
+            server_acl::RoomServerAclEventContent,
         },
         AnyEphemeralRoomEvent, EventType,
     },
@@ -3491,20 +3491,17 @@ pub(crate) async fn fetch_join_signing_keys(
 }
 
 /// Returns Ok if the acl allows the server
-fn acl_check(
-    server_name: &ServerName,
-    room_id: &RoomId,
-    db: &Database,
-) -> Result<()> {
+fn acl_check(server_name: &ServerName, room_id: &RoomId, db: &Database) -> Result<()> {
     let acl_event = match db
         .rooms
-        .room_state_get(room_id, &EventType::RoomServerAcl, "")? {
-            Some(acl) => acl,
-            None => return Ok(()),
-        };
+        .room_state_get(room_id, &EventType::RoomServerAcl, "")?
+    {
+        Some(acl) => acl,
+        None => return Ok(()),
+    };
 
-    let acl_event_content: RoomServerAclEventContent = match
-        serde_json::from_str(acl_event.content.get()) {
+    let acl_event_content: RoomServerAclEventContent =
+        match serde_json::from_str(acl_event.content.get()) {
             Ok(content) => content,
             Err(_) => {
                 warn!("Invalid ACL event");
@@ -3515,7 +3512,10 @@ fn acl_check(
     if acl_event_content.is_allowed(server_name) {
         Ok(())
     } else {
-        Err(Error::BadRequest(ErrorKind::Forbidden, "Server was denied by ACL"))
+        Err(Error::BadRequest(
+            ErrorKind::Forbidden,
+            "Server was denied by ACL",
+        ))
     }
 }