lint: fix clippy::collapsible_if

This commit is contained in:
Nora Widdecke 2022-02-18 14:32:49 +01:00
parent b2a7ca29b7
commit cd020cae40
2 changed files with 18 additions and 9 deletions

View File

@ -76,14 +76,12 @@ fn delete(db: &KeyDatabase, query: &Query, all_bindings: bool, mut all: bool)
results.push(
("all bindings".into(),
db.set_email_unpublished_all(&fp)));
} else {
if let Query::ByEmail(ref email) = query {
} else if let Query::ByEmail(ref email) = query {
results.push(
(email.to_string(),
db.set_email_unpublished(&fp, email)));
} else {
unreachable!()
}
} else {
unreachable!()
}
// Now delete the key(s) itself.

View File

@ -226,10 +226,21 @@ pub fn request_verify(
for email in emails_requested {
let rate_limit_ok = rate_limiter.action_perform(format!("verify-{}", &email));
if rate_limit_ok {
if send_verify_email(origin, mail_service, token_stateful, i18n, &verify_state.fpr, &email).is_err() {
return UploadResponse::err(&format!("error sending email to {}", &email));
}
if rate_limit_ok
&& send_verify_email(
origin,
mail_service,
token_stateful,
i18n,
&verify_state.fpr,
&email,
)
.is_err()
{
return UploadResponse::err(&format!(
"error sending email to {}",
&email
));
}
}