diff --git a/src/admin/mod.rs b/src/admin/mod.rs index 6c4a421cc..079aa0185 100644 --- a/src/admin/mod.rs +++ b/src/admin/mod.rs @@ -2,6 +2,7 @@ #![allow(clippy::wildcard_imports)] #![allow(clippy::enum_glob_use)] #![allow(clippy::too_many_arguments)] +#![allow(clippy::large_unopt_stack_frames, reason = "very large Subcommand macro expansions")] conduwuit_macros::introspect_crate! {} diff --git a/src/api/client/keys.rs b/src/api/client/keys.rs index d48bfdb3e..271e6b836 100644 --- a/src/api/client/keys.rs +++ b/src/api/client/keys.rs @@ -15,8 +15,7 @@ use ruma::{ OneTimeKeyAlgorithm, OwnedDeviceId, OwnedUserId, UserId, api::{ client::keys::{ - claim_keys, get_key_changes, get_keys, upload_keys, - upload_signatures::{self}, + claim_keys, get_key_changes, get_keys, upload_keys, upload_signatures, upload_signing_keys, }, federation, diff --git a/src/api/client/membership/knock.rs b/src/api/client/membership/knock.rs index a29d80929..d7ef2458a 100644 --- a/src/api/client/membership/knock.rs +++ b/src/api/client/membership/knock.rs @@ -16,10 +16,7 @@ use futures::{FutureExt, StreamExt}; use ruma::{ CanonicalJsonObject, CanonicalJsonValue, OwnedEventId, OwnedRoomId, OwnedServerName, OwnedUserId, RoomId, UserId, - api::{ - client::knock::knock_room, - federation::{self}, - }, + api::{client::knock::knock_room, federation}, canonical_json::to_canonical_value, events::{ StateEventType, diff --git a/src/api/client/membership/leave.rs b/src/api/client/membership/leave.rs index 1ef0b21fa..a10aff0f9 100644 --- a/src/api/client/membership/leave.rs +++ b/src/api/client/membership/leave.rs @@ -10,10 +10,7 @@ use conduwuit::{ use futures::{FutureExt, StreamExt, pin_mut}; use ruma::{ CanonicalJsonObject, CanonicalJsonValue, OwnedServerName, RoomId, UserId, - api::{ - client::membership::leave_room, - federation::{self}, - }, + api::{client::membership::leave_room, federation}, events::{ StateEventType, room::member::{MembershipState, RoomMemberEventContent}, diff --git a/src/api/client/membership/members.rs b/src/api/client/membership/members.rs index 5c8d00829..e2695bd3a 100644 --- a/src/api/client/membership/members.rs +++ b/src/api/client/membership/members.rs @@ -9,7 +9,7 @@ use conduwuit::{ use futures::{FutureExt, StreamExt, future::join}; use ruma::{ api::client::membership::{ - get_member_events::{self}, + get_member_events, joined_members::{self, v3::RoomMember}, }, events::{ diff --git a/src/api/client/room/create.rs b/src/api/client/room/create.rs index c4e5ed917..74f0653db 100644 --- a/src/api/client/room/create.rs +++ b/src/api/client/room/create.rs @@ -77,7 +77,7 @@ struct FullCreationContent { /// - Send events listed in initial state /// - Send events implied by `name` and `topic` /// - Send invite events -#[allow(clippy::large_stack_frames)] +#[allow(clippy::large_unopt_stack_frames)] #[allow(clippy::cognitive_complexity)] pub(crate) async fn create_room_route( State(services): State, diff --git a/src/api/client/room/initial_sync.rs b/src/api/client/room/initial_sync.rs index 9ae8dd73f..70b50f961 100644 --- a/src/api/client/room/initial_sync.rs +++ b/src/api/client/room/initial_sync.rs @@ -94,8 +94,7 @@ pub(crate) async fn room_initial_sync_route( .first() .map(at!(0)) .as_ref() - .map(ToString::to_string) - .unwrap_or_default(); + .map_or_default(ToString::to_string); let start = events.last().map(at!(0)).as_ref().map(ToString::to_string); let chunk = events diff --git a/src/api/client/sync/v3/joined.rs b/src/api/client/sync/v3/joined.rs index 3a2828e69..536dc2a9d 100644 --- a/src/api/client/sync/v3/joined.rs +++ b/src/api/client/sync/v3/joined.rs @@ -787,8 +787,7 @@ async fn build_room_summary( Ok(Some(assign!(RoomSummary::new(), { heroes: heroes - .map(|heroes| heroes.into_iter().collect()) - .unwrap_or_default(), + .map_or_default(|heroes| heroes.into_iter().collect()), joined_member_count: Some(ruma_from_u64(joined_member_count)), invited_member_count: Some(ruma_from_u64(invited_member_count)), }))) diff --git a/src/api/client/user_directory.rs b/src/api/client/user_directory.rs index 7d8a9a9c4..a8eb613d6 100644 --- a/src/api/client/user_directory.rs +++ b/src/api/client/user_directory.rs @@ -5,9 +5,7 @@ use conduwuit::{ }; use futures::{FutureExt, StreamExt, pin_mut}; use ruma::{ - api::client::user_directory::search_users::{self}, - assign, - events::room::join_rules::JoinRule, + api::client::user_directory::search_users, assign, events::room::join_rules::JoinRule, }; use crate::Ruma; diff --git a/src/api/server/make_join.rs b/src/api/server/make_join.rs index dcb74d433..aa0e99e37 100644 --- a/src/api/server/make_join.rs +++ b/src/api/server/make_join.rs @@ -69,7 +69,7 @@ pub(crate) async fn create_join_event_template_route( .get_member(&body.room_id, &body.user_id) .await .ok() - .map_or_else(|| MembershipState::Leave, |content| content.membership); + .map_or(MembershipState::Leave, |content| content.membership); let join_authorized_via_users_server: Option = { if matches!( diff --git a/src/database/engine/backup.rs b/src/database/engine/backup.rs index 9c6d899c7..ca874e7e9 100644 --- a/src/database/engine/backup.rs +++ b/src/database/engine/backup.rs @@ -76,8 +76,7 @@ impl super::Engine { .config .database_backup_path .clone() - .map(PathBuf::into_os_string) - .unwrap_or_default(); + .map_or_default(PathBuf::into_os_string); if path.is_empty() { return Err!(Config("database_backup_path", "Configure path to enable backups")); diff --git a/src/router/serve/unix.rs b/src/router/serve/unix.rs index 9bb3dd6e0..ceba1c1b9 100644 --- a/src/router/serve/unix.rs +++ b/src/router/serve/unix.rs @@ -22,7 +22,7 @@ use hyper_util::{ use tokio::{ fs, net::{UnixListener, UnixStream, unix::SocketAddr}, - sync::broadcast::{self}, + sync::broadcast, task::JoinSet, time::{Duration, sleep}, }; diff --git a/src/service/client/mod.rs b/src/service/client/mod.rs index 39f00b40c..2cd157f84 100644 --- a/src/service/client/mod.rs +++ b/src/service/client/mod.rs @@ -379,7 +379,7 @@ fn get_dns_resolver(server: &Arc) -> Result> { info!(?nameservers, "Resolved nameservers for DNS client"); for sys_conf in nameservers { - let mut ns = sys_conf.clone(); + let mut ns = sys_conf; if config.query_over_tcp_only { ns.connections = vec![ConnectionConfig::tcp()]; diff --git a/src/service/media/data.rs b/src/service/media/data.rs index 7416464f8..d4a1c15cd 100644 --- a/src/service/media/data.rs +++ b/src/service/media/data.rs @@ -182,26 +182,11 @@ impl Data { let mut value = Vec::::new(); value.extend_from_slice(×tamp.as_secs().to_be_bytes()); value.push(0xFF); - value.extend_from_slice( - data.title - .as_ref() - .map(String::as_bytes) - .unwrap_or_default(), - ); + value.extend_from_slice(data.title.as_ref().map_or_default(String::as_bytes)); value.push(0xFF); - value.extend_from_slice( - data.description - .as_ref() - .map(String::as_bytes) - .unwrap_or_default(), - ); + value.extend_from_slice(data.description.as_ref().map_or_default(String::as_bytes)); value.push(0xFF); - value.extend_from_slice( - data.image - .as_ref() - .map(String::as_bytes) - .unwrap_or_default(), - ); + value.extend_from_slice(data.image.as_ref().map_or_default(String::as_bytes)); value.push(0xFF); value.extend_from_slice(&data.image_size.unwrap_or(0).to_be_bytes()); value.push(0xFF); @@ -209,12 +194,7 @@ impl Data { value.push(0xFF); value.extend_from_slice(&data.image_height.unwrap_or(0).to_be_bytes()); value.push(0xFF); - value.extend_from_slice( - data.video - .as_ref() - .map(String::as_bytes) - .unwrap_or_default(), - ); + value.extend_from_slice(data.video.as_ref().map_or_default(String::as_bytes)); value.push(0xFF); value.extend_from_slice(&data.video_size.unwrap_or(0).to_be_bytes()); value.push(0xFF); @@ -222,12 +202,7 @@ impl Data { value.push(0xFF); value.extend_from_slice(&data.video_height.unwrap_or(0).to_be_bytes()); value.push(0xFF); - value.extend_from_slice( - data.audio - .as_ref() - .map(String::as_bytes) - .unwrap_or_default(), - ); + value.extend_from_slice(data.audio.as_ref().map_or_default(String::as_bytes)); value.push(0xFF); value.extend_from_slice(&data.audio_size.unwrap_or(0).to_be_bytes()); diff --git a/src/service/media/migrations.rs b/src/service/media/migrations.rs index 5fd628cd9..0cb91ea13 100644 --- a/src/service/media/migrations.rs +++ b/src/service/media/migrations.rs @@ -1,7 +1,7 @@ use std::{ collections::HashSet, ffi::{OsStr, OsString}, - fs::{self}, + fs, path::PathBuf, sync::Arc, time::Instant, diff --git a/src/service/mod.rs b/src/service/mod.rs index 9a8722cff..0560e135c 100644 --- a/src/service/mod.rs +++ b/src/service/mod.rs @@ -1,4 +1,5 @@ #![type_length_limit = "8192"] +#![recursion_limit = "256"] #![allow(refining_impl_trait)] extern crate conduwuit_core as conduwuit; diff --git a/src/service/rooms/membership/mod.rs b/src/service/rooms/membership/mod.rs index 93246d8c2..0659db2be 100644 --- a/src/service/rooms/membership/mod.rs +++ b/src/service/rooms/membership/mod.rs @@ -153,7 +153,7 @@ impl Service { .get_member(room_id, sender_user) .await .ok() - .map_or_else(|| MembershipState::Leave, |content| content.membership) + .map_or(MembershipState::Leave, |content| content.membership) } else { MembershipState::Leave }; diff --git a/src/service/rooms/short/mod.rs b/src/service/rooms/short/mod.rs index 53d70fe85..2287eea2d 100644 --- a/src/service/rooms/short/mod.rs +++ b/src/service/rooms/short/mod.rs @@ -8,10 +8,7 @@ use conduwuit::{ utils::{self, IterStream, ReadyExt}, }; use database::{Deserialized, Get, Map, Qry}; -use futures::{ - Stream, StreamExt, - stream::{self}, -}; +use futures::{Stream, StreamExt, stream}; use ruma::{EventId, OwnedEventId, RoomId, events::StateEventType}; use serde::Deserialize; diff --git a/src/service/rooms/state/mod.rs b/src/service/rooms/state/mod.rs index 147e944a7..c61d9349d 100644 --- a/src/service/rooms/state/mod.rs +++ b/src/service/rooms/state/mod.rs @@ -264,14 +264,11 @@ impl Service { .compress_state_event(shortstatekey, &new_pdu.event_id) .await; - let replaces = states_parents - .last() - .map(|info| { - info.full_state - .iter() - .find(|bytes| bytes.starts_with(&shortstatekey.to_be_bytes())) - }) - .unwrap_or_default(); + let replaces = states_parents.last().map_or_default(|info| { + info.full_state + .iter() + .find(|bytes| bytes.starts_with(&shortstatekey.to_be_bytes())) + }); if Some(&new) == replaces { return Ok(previous_shortstatehash.expect("must exist")); diff --git a/src/service/rooms/summary/mod.rs b/src/service/rooms/summary/mod.rs index ee643b6a6..d8d8d96fb 100644 --- a/src/service/rooms/summary/mod.rs +++ b/src/service/rooms/summary/mod.rs @@ -745,7 +745,7 @@ impl Service { .get_member(room_id, querying_user) .await .ok() - .map_or_else(|| MembershipState::Leave, |content| content.membership); + .map_or(MembershipState::Leave, |content| content.membership); if matches!(membership, MembershipState::Join | MembershipState::Invite) { return true; diff --git a/src/service/rooms/timeline/redact.rs b/src/service/rooms/timeline/redact.rs index 905cd40c7..0fbe4aba0 100644 --- a/src/service/rooms/timeline/redact.rs +++ b/src/service/rooms/timeline/redact.rs @@ -1,10 +1,5 @@ use conduwuit::config::experiments::ToggledExperiment; -use conduwuit_core::{ - Err, Result, err, - matrix::event::Event, - utils::{self}, - warn, -}; +use conduwuit_core::{Err, Result, err, matrix::event::Event, utils, warn}; use ruma::{EventId, events::room::encrypted::Relation, signatures::content_hash}; use super::{ExtractBody, ExtractRelatesTo}; diff --git a/src/service/server_keys/request.rs b/src/service/server_keys/request.rs index e3f03562a..f7b2ead17 100644 --- a/src/service/server_keys/request.rs +++ b/src/service/server_keys/request.rs @@ -101,8 +101,7 @@ impl super::Service { .trusted_servers .iter() .find(|n| n.server_name() == notary) - .map(|nk| nk.verify_keys().to_owned()) - .unwrap_or_default(); + .map_or_default(|nk| nk.verify_keys().to_owned()); let keys = self .services .sending diff --git a/src/service/transactions/mod.rs b/src/service/transactions/mod.rs index 094317c8b..9664abd00 100644 --- a/src/service/transactions/mod.rs +++ b/src/service/transactions/mod.rs @@ -143,7 +143,7 @@ impl Service { ) { let mut key = user_id.as_bytes().to_vec(); key.push(0xFF); - key.extend_from_slice(device_id.map(DeviceId::as_bytes).unwrap_or_default()); + key.extend_from_slice(device_id.map_or_default(DeviceId::as_bytes)); key.push(0xFF); key.extend_from_slice(txn_id.as_bytes()); diff --git a/src/service/users/mod.rs b/src/service/users/mod.rs index 09ade8a97..c02ff8647 100644 --- a/src/service/users/mod.rs +++ b/src/service/users/mod.rs @@ -9,10 +9,7 @@ pub(super) mod remote; use std::{mem, sync::Arc}; pub use account::{AccessTokenStatus, AccountStatus}; -use conduwuit::{ - Err, Error, Result, err, - utils::{self}, -}; +use conduwuit::{Err, Error, Result, err, utils}; use database::Map; pub use device::DeviceToken; pub use profile::ProfileFieldChange;