Skip to content

Commit 2c257ec

Browse files
committed
style: reduce indent in generate_one_time_keys
1 parent 1a18017 commit 2c257ec

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

crates/matrix-sdk-crypto/src/olm/account.rs

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -517,30 +517,30 @@ impl Account {
517517
// Only generate one-time keys if there aren't any, otherwise the caller
518518
// might have failed to upload them the last time this method was
519519
// called.
520-
if self.one_time_keys().is_empty() {
521-
let count = self.uploaded_key_count();
522-
let max_keys = self.max_one_time_keys();
520+
if !self.one_time_keys().is_empty() {
521+
return Some(0);
522+
}
523523

524-
if count >= max_keys as u64 {
525-
return None;
526-
}
524+
let count = self.uploaded_key_count();
525+
let max_keys = self.max_one_time_keys();
527526

528-
let key_count = (max_keys as u64) - count;
529-
let key_count: usize = key_count.try_into().unwrap_or(max_keys);
527+
if count >= max_keys as u64 {
528+
return None;
529+
}
530530

531-
let result = self.generate_one_time_keys_helper(key_count);
531+
let key_count = (max_keys as u64) - count;
532+
let key_count: usize = key_count.try_into().unwrap_or(max_keys);
532533

533-
debug!(
534-
count = key_count,
535-
discarded_keys = ?result.removed,
536-
created_keys = ?result.created,
537-
"Generated new one-time keys"
538-
);
534+
let result = self.generate_one_time_keys_helper(key_count);
539535

540-
Some(key_count as u64)
541-
} else {
542-
Some(0)
543-
}
536+
debug!(
537+
count = key_count,
538+
discarded_keys = ?result.removed,
539+
created_keys = ?result.created,
540+
"Generated new one-time keys"
541+
);
542+
543+
Some(key_count as u64)
544544
}
545545

546546
pub(crate) fn generate_fallback_key_helper(&mut self) {

0 commit comments

Comments
 (0)