From a62fa7b6eec8c423e1c606fdb84e79a550d5d226 Mon Sep 17 00:00:00 2001
From: Charles Hall <charles@computer.surgery>
Date: Tue, 14 May 2024 19:05:02 -0700
Subject: [PATCH] enable `similar_names` lint

---
 Cargo.toml                            |  1 +
 src/database/key_value/rooms/short.rs | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 34fe4709..5ee8f54a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -68,6 +68,7 @@ rest_pat_in_fully_bound_structs = "warn"
 same_name_method = "warn"
 semicolon_if_nothing_returned = "warn"
 semicolon_inside_block = "warn"
+similar_names = "warn"
 str_to_string = "warn"
 string_add = "warn"
 string_lit_chars_any = "warn"
diff --git a/src/database/key_value/rooms/short.rs b/src/database/key_value/rooms/short.rs
index 6ec4dd5f..66f7eb74 100644
--- a/src/database/key_value/rooms/short.rs
+++ b/src/database/key_value/rooms/short.rs
@@ -45,13 +45,13 @@ impl service::rooms::short::Data for KeyValueDatabase {
             return Ok(Some(*short));
         }
 
-        let mut statekey = event_type.to_string().as_bytes().to_vec();
-        statekey.push(0xff);
-        statekey.extend_from_slice(state_key.as_bytes());
+        let mut db_key = event_type.to_string().as_bytes().to_vec();
+        db_key.push(0xff);
+        db_key.extend_from_slice(state_key.as_bytes());
 
         let short = self
             .statekey_shortstatekey
-            .get(&statekey)?
+            .get(&db_key)?
             .map(|shortstatekey| {
                 utils::u64_from_bytes(&shortstatekey)
                     .map_err(|_| Error::bad_database("Invalid shortstatekey in db."))
@@ -82,19 +82,19 @@ impl service::rooms::short::Data for KeyValueDatabase {
             return Ok(*short);
         }
 
-        let mut statekey = event_type.to_string().as_bytes().to_vec();
-        statekey.push(0xff);
-        statekey.extend_from_slice(state_key.as_bytes());
+        let mut db_key = event_type.to_string().as_bytes().to_vec();
+        db_key.push(0xff);
+        db_key.extend_from_slice(state_key.as_bytes());
 
-        let short = match self.statekey_shortstatekey.get(&statekey)? {
+        let short = match self.statekey_shortstatekey.get(&db_key)? {
             Some(shortstatekey) => utils::u64_from_bytes(&shortstatekey)
                 .map_err(|_| Error::bad_database("Invalid shortstatekey in db."))?,
             None => {
                 let shortstatekey = services().globals.next_count()?;
                 self.statekey_shortstatekey
-                    .insert(&statekey, &shortstatekey.to_be_bytes())?;
+                    .insert(&db_key, &shortstatekey.to_be_bytes())?;
                 self.shortstatekey_statekey
-                    .insert(&shortstatekey.to_be_bytes(), &statekey)?;
+                    .insert(&shortstatekey.to_be_bytes(), &db_key)?;
                 shortstatekey
             }
         };