diff --git a/Cargo.toml b/Cargo.toml index 00087365..34fe4709 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -66,6 +66,7 @@ redundant_type_annotations = "warn" ref_patterns = "warn" rest_pat_in_fully_bound_structs = "warn" same_name_method = "warn" +semicolon_if_nothing_returned = "warn" semicolon_inside_block = "warn" str_to_string = "warn" string_add = "warn" diff --git a/src/api/client_server/backup.rs b/src/api/client_server/backup.rs index cf7f5468..daab262d 100644 --- a/src/api/client_server/backup.rs +++ b/src/api/client_server/backup.rs @@ -144,7 +144,7 @@ pub(crate) async fn add_backup_keys_route( room_id, session_id, key_data, - )? + )?; } } @@ -191,7 +191,7 @@ pub(crate) async fn add_backup_keys_for_room_route( &body.room_id, session_id, key_data, - )? + )?; } Ok(add_backup_keys_for_room::v3::Response { diff --git a/src/api/client_server/device.rs b/src/api/client_server/device.rs index 0bda0484..50ad47c1 100644 --- a/src/api/client_server/device.rs +++ b/src/api/client_server/device.rs @@ -162,7 +162,7 @@ pub(crate) async fn delete_devices_route( } for device_id in &body.devices { - services().users.remove_device(sender_user, device_id)? + services().users.remove_device(sender_user, device_id)?; } Ok(delete_devices::v3::Response {}) diff --git a/src/api/client_server/sync.rs b/src/api/client_server/sync.rs index 246b8ced..b5799bf5 100644 --- a/src/api/client_server/sync.rs +++ b/src/api/client_server/sync.rs @@ -1177,7 +1177,7 @@ pub(crate) async fn sync_events_v4_route( sender_user.clone(), sender_device.clone(), conn_id.clone(), - ) + ); } } diff --git a/src/api/client_server/to_device.rs b/src/api/client_server/to_device.rs index bfa79631..fbaad4d9 100644 --- a/src/api/client_server/to_device.rs +++ b/src/api/client_server/to_device.rs @@ -63,7 +63,7 @@ pub(crate) async fn send_event_to_device_route( event.deserialize_as().map_err(|_| { Error::BadRequest(ErrorKind::InvalidParam, "Event is invalid") })?, - )? + )?; } DeviceIdOrAllDevices::AllDevices => { diff --git a/src/api/server_server.rs b/src/api/server_server.rs index c4d6d60a..1799f71d 100644 --- a/src/api/server_server.rs +++ b/src/api/server_server.rs @@ -873,7 +873,7 @@ pub(crate) async fn send_transaction_message_route( "Event is invalid", ) })?, - )? + )?; } DeviceIdOrAllDevices::AllDevices => { @@ -1830,11 +1830,11 @@ pub(crate) async fn get_profile_information_route( match &body.field { Some(ProfileField::DisplayName) => { - displayname = services().users.displayname(&body.user_id)? + displayname = services().users.displayname(&body.user_id)?; } Some(ProfileField::AvatarUrl) => { avatar_url = services().users.avatar_url(&body.user_id)?; - blurhash = services().users.blurhash(&body.user_id)? + blurhash = services().users.blurhash(&body.user_id)?; } // TODO: what to do with custom Some(_) => {} @@ -1938,7 +1938,7 @@ mod tests { assert_eq!( add_port_to_hostname("example.com"), FedDest::Named(String::from("example.com"), String::from(":8448")) - ) + ); } #[test] @@ -1946,6 +1946,6 @@ mod tests { assert_eq!( add_port_to_hostname("example.com:1337"), FedDest::Named(String::from("example.com"), String::from(":1337")) - ) + ); } } diff --git a/src/config/proxy.rs b/src/config/proxy.rs index 7672e02b..2adab9f6 100644 --- a/src/config/proxy.rs +++ b/src/config/proxy.rs @@ -67,7 +67,7 @@ impl PartialProxyConfig { let mut excluded_because = None; // most specific reason it was excluded if self.include.is_empty() { // treat empty include list as `*` - included_because = Some(&WildCardedDomain::WildCard) + included_because = Some(&WildCardedDomain::WildCard); } for wc_domain in &self.include { if wc_domain.matches(domain) { diff --git a/src/database.rs b/src/database.rs index 2c61b0f7..d3fda641 100644 --- a/src/database.rs +++ b/src/database.rs @@ -964,7 +964,7 @@ impl KeyValueDatabase { error!( "Could not set the configured emergency password for the grapevine user: {}", e - ) + ); } }; diff --git a/src/database/key_value/sending.rs b/src/database/key_value/sending.rs index 3fc3e042..6c8e939b 100644 --- a/src/database/key_value/sending.rs +++ b/src/database/key_value/sending.rs @@ -67,9 +67,9 @@ impl service::sending::Data for KeyValueDatabase { for (outgoing_kind, event) in requests { let mut key = outgoing_kind.get_prefix(); if let SendingEventType::Pdu(value) = &event { - key.extend_from_slice(value) + key.extend_from_slice(value); } else { - key.extend_from_slice(&services().globals.next_count()?.to_be_bytes()) + key.extend_from_slice(&services().globals.next_count()?.to_be_bytes()); } let value = if let SendingEventType::Edu(value) = &event { &**value diff --git a/src/main.rs b/src/main.rs index 90248e11..ab06163f 100644 --- a/src/main.rs +++ b/src/main.rs @@ -230,7 +230,7 @@ async fn run_server() -> io::Result<()> { sd_notify::notify(true, &[sd_notify::NotifyState::Ready]) .expect("should be able to notify systemd"); - server.await? + server.await?; } None => { let server = bind(addr).handle(handle).serve(app); @@ -239,7 +239,7 @@ async fn run_server() -> io::Result<()> { sd_notify::notify(true, &[sd_notify::NotifyState::Ready]) .expect("should be able to notify systemd"); - server.await? + server.await?; } } diff --git a/src/service/admin.rs b/src/service/admin.rs index 8e33bdbb..6545c062 100644 --- a/src/service/admin.rs +++ b/src/service/admin.rs @@ -699,11 +699,11 @@ impl Service { match <&UserId>::try_from(user) { Ok(user_id) => { if user_id.server_name() != services().globals.server_name() { - remote_ids.push(user_id) + remote_ids.push(user_id); } else if !services().users.exists(user_id)? { - non_existant_ids.push(user_id) + non_existant_ids.push(user_id); } else { - user_ids.push(user_id) + user_ids.push(user_id); } } Err(_) => { @@ -773,12 +773,12 @@ impl Service { } } Err(_) => false, - }) + }); } for &user_id in &user_ids { if services().users.deactivate_account(user_id).is_ok() { - deactivation_count += 1 + deactivation_count += 1; } } diff --git a/src/service/pusher.rs b/src/service/pusher.rs index b35eac0a..2e54f867 100644 --- a/src/service/pusher.rs +++ b/src/service/pusher.rs @@ -256,7 +256,7 @@ impl Service { .iter() .any(|t| matches!(t, Tweak::Highlight(true) | Tweak::Sound(_))) { - notifi.prio = NotificationPriority::High + notifi.prio = NotificationPriority::High; } if event_id_only { diff --git a/src/service/rooms/event_handler.rs b/src/service/rooms/event_handler.rs index e4db6bb8..7751a172 100644 --- a/src/service/rooms/event_handler.rs +++ b/src/service/rooms/event_handler.rs @@ -199,7 +199,7 @@ impl Service { e.insert((Instant::now(), 1)); } hash_map::Entry::Occupied(mut e) => { - *e.get_mut() = (Instant::now(), e.get().1 + 1) + *e.get_mut() = (Instant::now(), e.get().1 + 1); } } continue; @@ -243,7 +243,7 @@ impl Service { e.insert((Instant::now(), 1)); } hash_map::Entry::Occupied(mut e) => { - *e.get_mut() = (Instant::now(), e.get().1 + 1) + *e.get_mut() = (Instant::now(), e.get().1 + 1); } } } @@ -1094,7 +1094,7 @@ impl Service { e.insert((Instant::now(), 1)); } hash_map::Entry::Occupied(mut e) => { - *e.get_mut() = (Instant::now(), e.get().1 + 1) + *e.get_mut() = (Instant::now(), e.get().1 + 1); } } }; diff --git a/src/service/sending.rs b/src/service/sending.rs index 3128781a..6ad34076 100644 --- a/src/service/sending.rs +++ b/src/service/sending.rs @@ -479,7 +479,7 @@ impl Service { ), ) })? - .to_room_event()) + .to_room_event()); } SendingEventType::Edu(_) => { // Appservices don't need EDUs (?)