From 3978b9c580da572d531bde2f7fb8878aeddd362e Mon Sep 17 00:00:00 2001
From: Charles Hall <charles@computer.surgery>
Date: Tue, 14 May 2024 19:44:26 -0700
Subject: [PATCH] enable `used_underscore_binding` lint

---
 Cargo.toml                        |  1 +
 src/database.rs                   | 10 +++++-----
 src/database/key_value/globals.rs |  4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 8e816675..578772b8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -92,6 +92,7 @@ unreadable_literal = "warn"
 unseparated_literal_suffix = "warn"
 unused_async = "warn"
 unused_self = "warn"
+used_underscore_binding = "warn"
 verbose_file_reads = "warn"
 wildcard_dependencies = "warn"
 
diff --git a/src/database.rs b/src/database.rs
index 3e105120..1410ca27 100644
--- a/src/database.rs
+++ b/src/database.rs
@@ -30,7 +30,7 @@ use std::{
 use tracing::{debug, error, info, warn};
 
 pub(crate) struct KeyValueDatabase {
-    _db: Arc<dyn KeyValueDatabaseEngine>,
+    db: Arc<dyn KeyValueDatabaseEngine>,
 
     //pub(crate) globals: globals::Globals,
     pub(super) global: Arc<dyn KvTree>,
@@ -246,7 +246,7 @@ impl KeyValueDatabase {
         }
 
         let db_raw = Box::new(Self {
-            _db: builder.clone(),
+            db: builder.clone(),
             userid_password: builder.open_tree("userid_password")?,
             userid_displayname: builder.open_tree("userid_displayname")?,
             userid_avatarurl: builder.open_tree("userid_avatarurl")?,
@@ -614,7 +614,7 @@ impl KeyValueDatabase {
                         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>()])
                         .expect("number of bytes is correct");
                     let sstatekey = k[size_of::<u64>()..].to_vec();
@@ -791,7 +791,7 @@ impl KeyValueDatabase {
             }
 
             if services().globals.database_version()? < 11 {
-                db._db
+                db.db
                     .open_tree("userdevicesessionid_uiaarequest")?
                     .clear()?;
                 services().globals.bump_database_version(11)?;
@@ -980,7 +980,7 @@ impl KeyValueDatabase {
     pub(crate) fn flush(&self) -> Result<()> {
         let start = std::time::Instant::now();
 
-        let res = self._db.flush();
+        let res = self.db.flush();
 
         debug!("flush: took {:?}", start.elapsed());
 
diff --git a/src/database/key_value/globals.rs b/src/database/key_value/globals.rs
index 0d58b241..59aaf575 100644
--- a/src/database/key_value/globals.rs
+++ b/src/database/key_value/globals.rs
@@ -118,7 +118,7 @@ impl service::globals::Data for KeyValueDatabase {
     }
 
     fn cleanup(&self) -> Result<()> {
-        self._db.cleanup()
+        self.db.cleanup()
     }
 
     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}
 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;
         }