From 58be22e69557f7045ad3fd433a438b33150ecd83 Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Thu, 28 Nov 2024 23:33:33 +0000 Subject: [PATCH] fix new lints; clippy::unnecessary-map-or Signed-off-by: Jason Volk --- src/core/log/reload.rs | 2 +- src/core/utils/sys.rs | 5 +---- src/service/media/migrations.rs | 2 +- src/service/migrations.rs | 4 ++-- src/service/rooms/spaces/mod.rs | 2 +- src/service/rooms/state_accessor/data.rs | 1 - src/service/rooms/timeline/mod.rs | 2 +- src/service/sending/dest.rs | 7 ++----- src/service/users/mod.rs | 2 +- 9 files changed, 10 insertions(+), 17 deletions(-) diff --git a/src/core/log/reload.rs b/src/core/log/reload.rs index 6d651065..12d14f48 100644 --- a/src/core/log/reload.rs +++ b/src/core/log/reload.rs @@ -54,7 +54,7 @@ impl LogLevelReloadHandles { .lock() .expect("locked") .iter() - .filter(|(name, _)| names.map_or(false, |names| names.contains(&name.as_str()))) + .filter(|(name, _)| names.is_some_and(|names| names.contains(&name.as_str()))) .for_each(|(_, handle)| { _ = handle.reload(new_value.clone()).or_else(error::else_log); }); diff --git a/src/core/utils/sys.rs b/src/core/utils/sys.rs index af8bd70b..f3ff08b6 100644 --- a/src/core/utils/sys.rs +++ b/src/core/utils/sys.rs @@ -58,8 +58,5 @@ pub unsafe fn current_exe() -> Result { /// accurate on all platforms; defaults to false. #[must_use] pub fn current_exe_deleted() -> bool { - std::env::current_exe().map_or(false, |exe| { - exe.to_str() - .map_or(false, |exe| exe.ends_with(" (deleted)")) - }) + std::env::current_exe().is_ok_and(|exe| exe.to_str().is_some_and(|exe| exe.ends_with(" (deleted)"))) } diff --git a/src/service/media/migrations.rs b/src/service/media/migrations.rs index f1c6da7d..3d9c395e 100644 --- a/src/service/media/migrations.rs +++ b/src/service/media/migrations.rs @@ -112,7 +112,7 @@ async fn handle_media_check( let old_is_symlink = || async { tokio::fs::symlink_metadata(old_path) .await - .map_or(false, |md| md.is_symlink()) + .is_ok_and(|md| md.is_symlink()) }; if config.prune_missing_media && !old_exists && !new_exists { diff --git a/src/service/migrations.rs b/src/service/migrations.rs index cded9bce..f9057036 100644 --- a/src/service/migrations.rs +++ b/src/service/migrations.rs @@ -413,7 +413,7 @@ async fn retroactively_fix_bad_data_from_roomuserid_joined(services: &Services) .rooms .state_accessor .get_member(room_id, user_id) - .map(|member| member.map_or(false, |member| member.membership == MembershipState::Join)) + .map(|member| member.is_ok_and(|member| member.membership == MembershipState::Join)) }) .collect::>() .await; @@ -426,7 +426,7 @@ async fn retroactively_fix_bad_data_from_roomuserid_joined(services: &Services) .rooms .state_accessor .get_member(room_id, user_id) - .map(|member| member.map_or(false, |member| member.membership == MembershipState::Join)) + .map(|member| member.is_ok_and(|member| member.membership == MembershipState::Join)) }) .collect::>() .await; diff --git a/src/service/rooms/spaces/mod.rs b/src/service/rooms/spaces/mod.rs index 0ef7ddf5..2b80e3dc 100644 --- a/src/service/rooms/spaces/mod.rs +++ b/src/service/rooms/spaces/mod.rs @@ -757,7 +757,7 @@ fn get_parent_children_via( fn next_room_to_traverse( stack: &mut Vec)>>, parents: &mut VecDeque, ) -> Option<(OwnedRoomId, Vec)> { - while stack.last().map_or(false, Vec::is_empty) { + while stack.last().is_some_and(Vec::is_empty) { stack.pop(); parents.pop_back(); } diff --git a/src/service/rooms/state_accessor/data.rs b/src/service/rooms/state_accessor/data.rs index 1ef91221..a6c2e429 100644 --- a/src/service/rooms/state_accessor/data.rs +++ b/src/service/rooms/state_accessor/data.rs @@ -179,7 +179,6 @@ impl Data { } /// Returns the full room state. - #[allow(unused_qualifications)] // async traits pub(super) async fn room_state_full( &self, room_id: &RoomId, ) -> Result>> { diff --git a/src/service/rooms/timeline/mod.rs b/src/service/rooms/timeline/mod.rs index 5d5566cb..c0b48b9b 100644 --- a/src/service/rooms/timeline/mod.rs +++ b/src/service/rooms/timeline/mod.rs @@ -616,7 +616,7 @@ impl Service { && pdu .state_key .as_ref() - .map_or(false, |state_key| users.is_match(state_key)) + .is_some_and(|state_key| users.is_match(state_key)) }; let matching_aliases = |aliases: NamespaceRegex| { self.services diff --git a/src/service/sending/dest.rs b/src/service/sending/dest.rs index 234a0b90..d35350c5 100644 --- a/src/service/sending/dest.rs +++ b/src/service/sending/dest.rs @@ -24,10 +24,7 @@ pub(super) fn get_prefix(&self) -> Vec { }, Self::Appservice(server) => { let sigil = b"+"; - let len = sigil - .len() - .saturating_add(server.as_bytes().len()) - .saturating_add(1); + let len = sigil.len().saturating_add(server.len()).saturating_add(1); let mut p = Vec::with_capacity(len); p.extend_from_slice(sigil); @@ -41,7 +38,7 @@ pub(super) fn get_prefix(&self) -> Vec { .len() .saturating_add(user.as_bytes().len()) .saturating_add(1) - .saturating_add(pushkey.as_bytes().len()) + .saturating_add(pushkey.len()) .saturating_add(1); let mut p = Vec::with_capacity(len); diff --git a/src/service/users/mod.rs b/src/service/users/mod.rs index 1f8c56df..2462dde3 100644 --- a/src/service/users/mod.rs +++ b/src/service/users/mod.rs @@ -101,7 +101,7 @@ impl Service { .account_data .get_global(recipient_user, GlobalAccountDataEventType::IgnoredUserList) .await - .map_or(false, |ignored: IgnoredUserListEvent| { + .is_ok_and(|ignored: IgnoredUserListEvent| { ignored .content .ignored_users