backups/grapevine
1
0
Fork 0
mirror of https://gitlab.computer.surgery/matrix/grapevine.git synced 2025-12-17 15:51:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

enable used_underscore_binding lint

Browse source
This commit is contained in:
Charles Hall 2024-05-14 19:44:26 -07:00
parent e3672eb4e0
commit 3978b9c580
No known key found for this signature in database
GPG key ID: 7B8E0645816E07CF
3 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Cargo.toml
View file

@ -92,6 +92,7 @@ unreadable_literal = "warn"
unseparated_literal_suffix = "warn" unseparated_literal_suffix = "warn"
unused_async = "warn" unused_async = "warn"
unused_self = "warn" unused_self = "warn"
used_underscore_binding = "warn"
verbose_file_reads = "warn" verbose_file_reads = "warn"
wildcard_dependencies = "warn" wildcard_dependencies = "warn"

10
src/database.rs
View file

@ -30,7 +30,7 @@ use std::{
use tracing::{debug, error, info, warn}; use tracing::{debug, error, info, warn};
pub(crate) struct KeyValueDatabase { pub(crate) struct KeyValueDatabase {
_db: Arc<dyn KeyValueDatabaseEngine>, db: Arc<dyn KeyValueDatabaseEngine>,
//pub(crate) globals: globals::Globals, //pub(crate) globals: globals::Globals,
pub(super) global: Arc<dyn KvTree>, pub(super) global: Arc<dyn KvTree>,
@ -246,7 +246,7 @@ impl KeyValueDatabase {
} }
let db_raw = Box::new(Self { let db_raw = Box::new(Self {
_db: builder.clone(), db: builder.clone(),
userid_password: builder.open_tree("userid_password")?, userid_password: builder.open_tree("userid_password")?,
userid_displayname: builder.open_tree("userid_displayname")?, userid_displayname: builder.open_tree("userid_displayname")?,
userid_avatarurl: builder.open_tree("userid_avatarurl")?, userid_avatarurl: builder.open_tree("userid_avatarurl")?,
@ -614,7 +614,7 @@ impl KeyValueDatabase {
Ok::<_, Error>(()) Ok::<_, Error>(())
}; };
for (k, seventid) in db._db.open_tree("stateid_shorteventid")?.iter() { for (k, seventid) in db.db.open_tree("stateid_shorteventid")?.iter() {
let sstatehash = utils::u64_from_bytes(&k[0..size_of::<u64>()]) let sstatehash = utils::u64_from_bytes(&k[0..size_of::<u64>()])
.expect("number of bytes is correct"); .expect("number of bytes is correct");
let sstatekey = k[size_of::<u64>()..].to_vec(); let sstatekey = k[size_of::<u64>()..].to_vec();
@ -791,7 +791,7 @@ impl KeyValueDatabase {
} }
if services().globals.database_version()? < 11 { if services().globals.database_version()? < 11 {
db._db db.db
.open_tree("userdevicesessionid_uiaarequest")? .open_tree("userdevicesessionid_uiaarequest")?
.clear()?; .clear()?;
services().globals.bump_database_version(11)?; services().globals.bump_database_version(11)?;
@ -980,7 +980,7 @@ impl KeyValueDatabase {
pub(crate) fn flush(&self) -> Result<()> { pub(crate) fn flush(&self) -> Result<()> {
let start = std::time::Instant::now(); let start = std::time::Instant::now();
let res = self._db.flush(); let res = self.db.flush();
debug!("flush: took {:?}", start.elapsed()); debug!("flush: took {:?}", start.elapsed());

4
src/database/key_value/globals.rs
View file

@ -118,7 +118,7 @@ impl service::globals::Data for KeyValueDatabase {
} }
fn cleanup(&self) -> Result<()> { fn cleanup(&self) -> Result<()> {
self._db.cleanup() self.db.cleanup()
} }
fn memory_usage(&self) -> String { fn memory_usage(&self) -> String {
@ -142,7 +142,7 @@ our_real_users_cache: {our_real_users_cache}
appservice_in_room_cache: {appservice_in_room_cache} appservice_in_room_cache: {appservice_in_room_cache}
lasttimelinecount_cache: {lasttimelinecount_cache}\n" lasttimelinecount_cache: {lasttimelinecount_cache}\n"
); );
if let Ok(db_stats) = self._db.memory_usage() { if let Ok(db_stats) = self.db.memory_usage() {
response += &db_stats; response += &db_stats;
} }