kg333
/
tenebrous-dicebot
forked from projectmoon/tenebrous-dicebot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Avoid key clone when deleting variables. Minor db code cleanup.

This commit is contained in:
projectmoon 2021-02-07 21:16:58 +00:00
parent 14f8bc8b39
commit 94be4d2578
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/db/variables.rs
View File

@ -21,7 +21,7 @@ pub struct Variables {
pub(in crate::db) room_user_variable_count: Tree, pub(in crate::db) room_user_variable_count: Tree,
} }
/// Request soemthing by a username and room ID. /// Request something by a username and room ID.
pub struct UserAndRoom<'a>(pub &'a str, pub &'a str); pub struct UserAndRoom<'a>(pub &'a str, pub &'a str);
fn to_vec(value: &UserAndRoom<'_>) -> Vec<u8> { fn to_vec(value: &UserAndRoom<'_>) -> Vec<u8> {
@ -83,7 +83,7 @@ impl Variables {
prefix.push(0xff); prefix.push(0xff);
let prefix_len: usize = prefix.len(); let prefix_len: usize = prefix.len();
let variables: Result<Vec<_>, DataError> = self let variables: Result<Vec<(String, i32)>, DataError> = self
.room_user_variables .room_user_variables
.scan_prefix(prefix) .scan_prefix(prefix)
.map(|entry| match entry { .map(|entry| match entry {
@ -96,7 +96,8 @@ impl Variables {
}) })
.collect(); .collect();
//Convert I32 to hash map. collect() inferred via return type. // Convert tuples to hash map with collect(), inferred via
// return type.
variables.map(|entries| entries.into_iter().collect()) variables.map(|entries| entries.into_iter().collect())
} }
@ -168,8 +169,7 @@ impl Variables {
key.push(0xff); key.push(0xff);
key.extend_from_slice(variable_name.as_bytes()); key.extend_from_slice(variable_name.as_bytes());
//TODO why does tx.remove require moving the key? if let Some(_) = tx_vars.remove(key)? {
if let Some(_) = tx_vars.remove(key.clone())? {
if let Err(e) = alter_room_variable_count(&tx_counts, user_and_room, -1) { if let Err(e) = alter_room_variable_count(&tx_counts, user_and_room, -1) {
return abort(e); return abort(e);
} }