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 similar_names lint

Browse source
This commit is contained in:
Charles Hall 2024-05-14 19:05:02 -07:00
parent db4951c5fd
commit a62fa7b6ee
No known key found for this signature in database
GPG key ID: 7B8E0645816E07CF
2 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Cargo.toml
View file

@ -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"

20
src/database/key_value/rooms/short.rs
View file

@ -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
}
};