chore: Fix some clippy lint warnings around the usage of map_or

crates/matrix-sdk-base/src/latest_event.rs

@@ -74,7 +74,7 @@ pub fn is_suitable_for_latest_event<'a>(
             // Check if this is a replacement for another message. If it is, ignore it
             if let Some(original_message) = message.as_original() {
                 let is_replacement =
-                    original_message.content.relates_to.as_ref().map_or(false, |relates_to| {
+                    original_message.content.relates_to.as_ref().is_some_and(|relates_to| {
                         if let Some(relation_type) = relates_to.rel_type() {
                             relation_type == RelationType::Replacement
                         } else {
@@ -83,12 +83,13 @@ pub fn is_suitable_for_latest_event<'a>(
                     });
 
                 if is_replacement {
-                    return PossibleLatestEvent::NoUnsupportedMessageLikeType;
+                    PossibleLatestEvent::NoUnsupportedMessageLikeType
+                } else {
+                    PossibleLatestEvent::YesRoomMessage(message)
                 }
-                return PossibleLatestEvent::YesRoomMessage(message);
+            } else {
+                PossibleLatestEvent::YesRoomMessage(message)
             }
-
-            return PossibleLatestEvent::YesRoomMessage(message);
         }
 
         AnySyncTimelineEvent::MessageLike(AnySyncMessageLikeEvent::UnstablePollStart(poll)) => {

crates/matrix-sdk-base/src/read_receipts.rs

@@ -438,7 +438,7 @@ fn events_intersects<'a>(
     let previous_events_ids = BTreeSet::from_iter(previous_events.filter_map(|ev| ev.event_id()));
     new_events
         .iter()
-        .any(|ev| ev.event_id().map_or(false, |event_id| previous_events_ids.contains(&event_id)))
+        .any(|ev| ev.event_id().is_some_and(|event_id| previous_events_ids.contains(&event_id)))
 }
 
 /// Given a set of events coming from sync, for a room, update the

crates/matrix-sdk-crypto/src/identities/manager.rs

@@ -548,7 +548,7 @@ impl IdentityManager {
             // First time seen, create the identity. The current MSK will be pinned.
             let identity = OtherUserIdentityData::new(master_key, self_signing)?;
             let is_verified = maybe_verified_own_identity
-                .map_or(false, |own_user_identity| own_user_identity.is_identity_signed(&identity));
+                .is_some_and(|own_user_identity| own_user_identity.is_identity_signed(&identity));
             if is_verified {
                 identity.mark_as_previously_verified();
             }

crates/matrix-sdk-crypto/src/identities/user.rs

@@ -854,8 +854,8 @@ impl OtherUserIdentityData {
 
         // Check if the new master_key is signed by our own **verified**
         // user_signing_key. If the identity was verified we remember it.
-        let updated_is_verified = maybe_verified_own_user_signing_key
-            .map_or(false, |own_user_signing_key| {
+        let updated_is_verified =
+            maybe_verified_own_user_signing_key.is_some_and(|own_user_signing_key| {
                 own_user_signing_key.verify_master_key(&master_key).is_ok()
             });
 

crates/matrix-sdk-crypto/src/store/crypto_store_wrapper.rs

@@ -102,7 +102,7 @@ impl CryptoStoreWrapper {
             .await?
             .as_ref()
             .and_then(|i| i.own())
-            .map_or(false, |own| own.is_verified());
+            .is_some_and(|own| own.is_verified());
 
         let secrets = changes.secrets.to_owned();
         let devices = changes.devices.to_owned();

crates/matrix-sdk-ui/src/timeline/controller/state.rs

@@ -1031,7 +1031,7 @@ impl TimelineMetadata {
                 .skip(*i + 1)
                 // …that's not virtual and not sent by us…
                 .find(|(_, item)| {
-                    item.as_event().map_or(false, |event| event.sender() != self.own_user_id)
+                    item.as_event().is_some_and(|event| event.sender() != self.own_user_id)
                 })
                 .map(|(i, _)| i);
 

crates/matrix-sdk/src/widget/machine/mod.rs

@@ -588,13 +588,13 @@ impl WidgetMachine {
                 let update = NotifyCapabilitiesChanged { approved, requested };
                 let (_request, action) = machine.send_to_widget_request(update);
 
-                subscribe_required.then(|| Action::Subscribe).into_iter().chain(action).collect()
+                subscribe_required.then_some(Action::Subscribe).into_iter().chain(action).collect()
             });
 
             action.map(|a| vec![a]).unwrap_or_default()
         });
 
-        unsubscribe_required.then(|| Action::Unsubscribe).into_iter().chain(action).collect()
+        unsubscribe_required.then_some(Action::Unsubscribe).into_iter().chain(action).collect()
     }
 }