From f7e8054a003af6f8f4211a2543d3ac7fe05b4572 Mon Sep 17 00:00:00 2001
From: strawberry <strawberry@puppygock.gay>
Date: Wed, 20 Mar 2024 00:03:07 -0400
Subject: [PATCH] fix lints
Signed-off-by: strawberry <strawberry@puppygock.gay>
---
src/database/abstraction.rs | 11 ++++-----
src/database/abstraction/rocksdb.rs | 38 +++++++++++++----------------
src/database/key_value/globals.rs | 8 ++----
src/service/admin/mod.rs | 8 +++---
src/service/globals/data.rs | 3 +--
5 files changed, 28 insertions(+), 40 deletions(-)
diff --git a/src/database/abstraction.rs b/src/database/abstraction.rs
index 5f6e6000b..0fabb3ce6 100644
--- a/src/database/abstraction.rs
+++ b/src/database/abstraction.rs
@@ -18,6 +18,7 @@ fn open(config: &Config) -> Result<Self>
Self: Sized;
fn open_tree(&self, name: &'static str) -> Result<Arc<dyn KvTree>>;
fn flush(&self) -> Result<()>;
+ #[allow(dead_code)]
fn sync(&self) -> Result<()> { Ok(()) }
fn cleanup(&self) -> Result<()> { Ok(()) }
fn memory_usage(&self) -> Result<String> {
@@ -27,13 +28,9 @@ fn memory_usage(&self) -> Result<String> {
#[allow(dead_code)]
fn clear_caches(&self) {}
- fn backup(&self) -> Result<(), Box<dyn Error>> {
- unimplemented!()
- }
+ fn backup(&self) -> Result<(), Box<dyn Error>> { unimplemented!() }
- fn backup_list(&self) -> Result<String> {
- Ok(String::new())
- }
+ fn backup_list(&self) -> Result<String> { Ok(String::new()) }
}
pub(crate) trait KvTree: Send + Sync {
@@ -57,6 +54,8 @@ fn insert_batch(&self, iter: &mut dyn Iterator<Item = (Vec<u8>, Vec<u8>)>) -> Re
}
fn remove(&self, key: &[u8]) -> Result<()>;
+
+ #[allow(dead_code)]
fn remove_batch(&self, iter: &mut dyn Iterator<Item = Vec<u8>>) -> Result<()> {
for key in iter {
self.remove(&key)?;
diff --git a/src/database/abstraction/rocksdb.rs b/src/database/abstraction/rocksdb.rs
index 5487cc422..22f422fb2 100644
--- a/src/database/abstraction/rocksdb.rs
+++ b/src/database/abstraction/rocksdb.rs
@@ -3,11 +3,8 @@
pin::Pin,
sync::{Arc, RwLock},
};
-use chrono::{
- DateTime,
- Utc,
-};
+use chrono::{DateTime, Utc};
use rust_rocksdb::{
backup::{BackupEngine, BackupEngineOptions},
LogLevel::{Debug, Error, Fatal, Info, Warn},
@@ -80,8 +77,8 @@ fn db_options(
block_based_options.set_optimize_filters_for_memory(true);
block_based_options.set_cache_index_and_filter_blocks(true);
block_based_options.set_pin_top_level_index_and_filter(true);
- block_based_options.set_block_cache(&col_cache);
- db_opts.set_row_cache(&row_cache);
+ block_based_options.set_block_cache(col_cache);
+ db_opts.set_row_cache(row_cache);
// Buffers
db_opts.set_write_buffer_size(2 * 1024 * 1024);
@@ -232,7 +229,7 @@ fn backup(&self) -> Result<(), Box<dyn std::error::Error>> {
return Ok(());
}
- let options = BackupEngineOptions::new(&path.unwrap())?;
+ let options = BackupEngineOptions::new(path.unwrap())?;
let mut engine = BackupEngine::open(&options, &self.env)?;
let ret = if self.config.database_backups_to_keep > 0 {
match engine.create_new_backup_flush(&self.rocks, true) {
@@ -242,9 +239,7 @@ fn backup(&self) -> Result<(), Box<dyn std::error::Error>> {
let info = &_info.last().unwrap();
info!(
"Created database backup #{} using {} bytes in {} files",
- info.backup_id,
- info.size,
- info.num_files,
+ info.backup_id, info.size, info.num_files,
);
Ok(())
},
@@ -255,7 +250,7 @@ fn backup(&self) -> Result<(), Box<dyn std::error::Error>> {
if self.config.database_backups_to_keep >= 0 {
let keep = u32::try_from(self.config.database_backups_to_keep)?;
- if let Err(e) = engine.purge_old_backups(keep.try_into()?) {
+ if let Err(e) = engine.purge_old_backups(keep.try_into()?) {
error!("Failed to purge old backup: {:?}", e.to_string())
}
}
@@ -270,18 +265,19 @@ fn backup_list(&self) -> Result<String> {
}
let mut res = String::new();
- let options = BackupEngineOptions::new(&path.unwrap())?;
+ let options = BackupEngineOptions::new(path.unwrap())?;
let engine = BackupEngine::open(&options, &self.env)?;
for info in engine.get_backup_info() {
- std::fmt::write(&mut res, format_args!(
- "#{} {}: {} bytes, {} files\n",
- info.backup_id,
- DateTime::<Utc>::from_timestamp(info.timestamp, 0)
- .unwrap()
- .to_rfc2822(),
- info.size,
- info.num_files,
- ))
+ std::fmt::write(
+ &mut res,
+ format_args!(
+ "#{} {}: {} bytes, {} files\n",
+ info.backup_id,
+ DateTime::<Utc>::from_timestamp(info.timestamp, 0).unwrap().to_rfc2822(),
+ info.size,
+ info.num_files,
+ ),
+ )
.unwrap();
}
diff --git a/src/database/key_value/globals.rs b/src/database/key_value/globals.rs
index 273442fac..55ebed4a2 100644
--- a/src/database/key_value/globals.rs
+++ b/src/database/key_value/globals.rs
@@ -273,11 +273,7 @@ fn bump_database_version(&self, new_version: u64) -> Result<()> {
Ok(())
}
- fn backup(&self) -> Result<(), Box<dyn std::error::Error>> {
- self.db.backup()
- }
+ fn backup(&self) -> Result<(), Box<dyn std::error::Error>> { self.db.backup() }
- fn backup_list(&self) -> Result<String> {
- self.db.backup_list()
- }
+ fn backup_list(&self) -> Result<String> { self.db.backup_list() }
}
diff --git a/src/service/admin/mod.rs b/src/service/admin/mod.rs
index 11fc58c15..2250ddb68 100644
--- a/src/service/admin/mod.rs
+++ b/src/service/admin/mod.rs
@@ -1878,11 +1878,9 @@ async fn process_admin_command(&self, command: AdminCommand, body: Vec<&str>) ->
RoomMessageEventContent::text_plain(result)
},
ServerCommand::BackupDatabase => {
- let mut result = tokio::task::spawn_blocking(move || {
- match services().globals.db.backup() {
- Ok(_) => String::new(),
- Err(e) => (*e).to_string(),
- }
+ let mut result = tokio::task::spawn_blocking(move || match services().globals.db.backup() {
+ Ok(_) => String::new(),
+ Err(e) => (*e).to_string(),
})
.await
.unwrap();
diff --git a/src/service/globals/data.rs b/src/service/globals/data.rs
index a9cda9e12..8322c1aa8 100644
--- a/src/service/globals/data.rs
+++ b/src/service/globals/data.rs
@@ -1,5 +1,4 @@
-use std::collections::BTreeMap;
-use std::error::Error;
+use std::{collections::BTreeMap, error::Error};
use async_trait::async_trait;
use ruma::{
--
GitLab