mirror of
https://gitlab.computer.surgery/matrix/grapevine.git
synced 2025-12-17 07:41:23 +01:00
enable ignored_unit_patterns lint
This commit is contained in:
parent
623824dc0c
commit
b0f65913f3
5 changed files with 6 additions and 8 deletions
|
|
@ -37,6 +37,7 @@ format_push_string = "warn"
|
||||||
get_unwrap = "warn"
|
get_unwrap = "warn"
|
||||||
if_not_else = "warn"
|
if_not_else = "warn"
|
||||||
if_then_some_else_none = "warn"
|
if_then_some_else_none = "warn"
|
||||||
|
ignored_unit_patterns = "warn"
|
||||||
impl_trait_in_params = "warn"
|
impl_trait_in_params = "warn"
|
||||||
let_underscore_must_use = "warn"
|
let_underscore_must_use = "warn"
|
||||||
lossy_float_literal = "warn"
|
lossy_float_literal = "warn"
|
||||||
|
|
|
||||||
|
|
@ -22,10 +22,7 @@ impl service::pusher::Data for KeyValueDatabase {
|
||||||
let mut key = sender.as_bytes().to_vec();
|
let mut key = sender.as_bytes().to_vec();
|
||||||
key.push(0xff);
|
key.push(0xff);
|
||||||
key.extend_from_slice(ids.pushkey.as_bytes());
|
key.extend_from_slice(ids.pushkey.as_bytes());
|
||||||
self.senderkey_pusher
|
self.senderkey_pusher.remove(&key).map_err(Into::into)
|
||||||
.remove(&key)
|
|
||||||
.map(|_| ())
|
|
||||||
.map_err(Into::into)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -486,8 +486,8 @@ async fn shutdown_signal(handle: ServerHandle) {
|
||||||
let sig: &str;
|
let sig: &str;
|
||||||
|
|
||||||
tokio::select! {
|
tokio::select! {
|
||||||
_ = ctrl_c => { sig = "Ctrl+C"; },
|
() = ctrl_c => { sig = "Ctrl+C"; },
|
||||||
_ = terminate => { sig = "SIGTERM"; },
|
() = terminate => { sig = "SIGTERM"; },
|
||||||
}
|
}
|
||||||
|
|
||||||
warn!("Received {}, shutting down...", sig);
|
warn!("Received {}, shutting down...", sig);
|
||||||
|
|
|
||||||
|
|
@ -842,7 +842,7 @@ impl Service {
|
||||||
|
|
||||||
let pub_key_map = pub_key_map.read().await;
|
let pub_key_map = pub_key_map.read().await;
|
||||||
match ruma::signatures::verify_json(&pub_key_map, &value) {
|
match ruma::signatures::verify_json(&pub_key_map, &value) {
|
||||||
Ok(_) => RoomMessageEventContent::text_plain("Signature correct"),
|
Ok(()) => RoomMessageEventContent::text_plain("Signature correct"),
|
||||||
Err(e) => RoomMessageEventContent::text_plain(format!(
|
Err(e) => RoomMessageEventContent::text_plain(format!(
|
||||||
"Signature verification failed: {e}"
|
"Signature verification failed: {e}"
|
||||||
)),
|
)),
|
||||||
|
|
|
||||||
|
|
@ -763,7 +763,7 @@ impl Service {
|
||||||
&mut pdu_json,
|
&mut pdu_json,
|
||||||
&room_version_id,
|
&room_version_id,
|
||||||
) {
|
) {
|
||||||
Ok(_) => {}
|
Ok(()) => {}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
return match e {
|
return match e {
|
||||||
ruma::signatures::Error::PduSize => Err(Error::BadRequest(
|
ruma::signatures::Error::PduSize => Err(Error::BadRequest(
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue