enable missing_assert_message lint

This commit is contained in:
Charles Hall 2024-05-12 18:28:41 -07:00
parent 052f3088e9
commit 4a7b9c16cc
No known key found for this signature in database
GPG key ID: 7B8E0645816E07CF
3 changed files with 19 additions and 10 deletions

View file

@ -35,6 +35,7 @@ impl_trait_in_params = "warn"
let_underscore_must_use = "warn" let_underscore_must_use = "warn"
lossy_float_literal = "warn" lossy_float_literal = "warn"
mem_forget = "warn" mem_forget = "warn"
missing_assert_message = "warn"
mod_module_files = "warn" mod_module_files = "warn"
mutex_atomic = "warn" mutex_atomic = "warn"
negative_feature_names = "warn" negative_feature_names = "warn"

View file

@ -929,7 +929,8 @@ impl KeyValueDatabase {
assert_eq!( assert_eq!(
services().globals.database_version().unwrap(), services().globals.database_version().unwrap(),
latest_database_version latest_database_version,
"database should be migrated to the current version",
); );
info!( info!(

View file

@ -198,8 +198,10 @@ impl service::users::Data for KeyValueDatabase {
token: &str, token: &str,
initial_device_display_name: Option<String>, initial_device_display_name: Option<String>,
) -> Result<()> { ) -> Result<()> {
// This method should never be called for nonexistent users. assert!(
assert!(self.exists(user_id)?); self.exists(user_id)?,
"user must exist before calling this method"
);
let mut userdeviceid = user_id.as_bytes().to_vec(); let mut userdeviceid = user_id.as_bytes().to_vec();
userdeviceid.push(0xff); userdeviceid.push(0xff);
@ -285,8 +287,10 @@ impl service::users::Data for KeyValueDatabase {
userdeviceid.push(0xff); userdeviceid.push(0xff);
userdeviceid.extend_from_slice(device_id.as_bytes()); userdeviceid.extend_from_slice(device_id.as_bytes());
// All devices have metadata assert!(
assert!(self.userdeviceid_metadata.get(&userdeviceid)?.is_some()); self.userdeviceid_metadata.get(&userdeviceid)?.is_some(),
"devices should have metadata"
);
// Remove old token // Remove old token
if let Some(old_token) = self.userdeviceid_token.get(&userdeviceid)? { if let Some(old_token) = self.userdeviceid_token.get(&userdeviceid)? {
@ -314,9 +318,10 @@ impl service::users::Data for KeyValueDatabase {
key.push(0xff); key.push(0xff);
key.extend_from_slice(device_id.as_bytes()); key.extend_from_slice(device_id.as_bytes());
// All devices have metadata assert!(
// Only existing devices should be able to call this. self.userdeviceid_metadata.get(&key)?.is_some(),
assert!(self.userdeviceid_metadata.get(&key)?.is_some()); "devices should have metadata and this method should only be called with existing devices"
);
key.push(0xff); key.push(0xff);
// TODO: Use DeviceKeyId::to_string when it's available (and update everything, // TODO: Use DeviceKeyId::to_string when it's available (and update everything,
@ -852,8 +857,10 @@ impl service::users::Data for KeyValueDatabase {
userdeviceid.push(0xff); userdeviceid.push(0xff);
userdeviceid.extend_from_slice(device_id.as_bytes()); userdeviceid.extend_from_slice(device_id.as_bytes());
// Only existing devices should be able to call this. assert!(
assert!(self.userdeviceid_metadata.get(&userdeviceid)?.is_some()); self.userdeviceid_metadata.get(&userdeviceid)?.is_some(),
"this method should only be called with existing devices"
);
self.userid_devicelistversion self.userid_devicelistversion
.increment(user_id.as_bytes())?; .increment(user_id.as_bytes())?;