From af547243a700bf57d322bcc383f4a1139a599106 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Commaille?= <zecakeh@tedomum.fr>
Date: Wed, 20 Dec 2023 17:13:37 +0100
Subject: [PATCH] misc: Use is_some_and instead of map_or

---
 src/components/label_with_widgets.rs           | 2 +-
 src/session/model/room/member_list.rs          | 2 +-
 src/session/model/sidebar_data/category/mod.rs | 2 +-
 src/session/model/user.rs                      | 2 +-
 src/session/view/sidebar/mod.rs                | 2 +-
 src/session/view/sidebar/row.rs                | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/components/label_with_widgets.rs b/src/components/label_with_widgets.rs
index 4fdd64ce..7f1aa639 100644
--- a/src/components/label_with_widgets.rs
+++ b/src/components/label_with_widgets.rs
@@ -199,7 +199,7 @@ impl LabelWithWidgets {
     fn allocate_shapes(&self) {
         let imp = self.imp();
 
-        if imp.label.borrow().as_ref().map_or(true, |s| s.is_empty()) {
+        if !imp.label.borrow().as_ref().is_some_and(|s| !s.is_empty()) {
             // No need to compute shapes if the label is empty.
             return;
         }
diff --git a/src/session/model/room/member_list.rs b/src/session/model/room/member_list.rs
index eaeb3002..5b357b37 100644
--- a/src/session/model/room/member_list.rs
+++ b/src/session/model/room/member_list.rs
@@ -273,6 +273,6 @@ impl MemberList {
             .members
             .borrow()
             .get(user_id)
-            .map_or_else(|| Membership::Leave, |member| member.membership())
+            .map_or(Membership::Leave, |member| member.membership())
     }
 }
diff --git a/src/session/model/sidebar_data/category/mod.rs b/src/session/model/sidebar_data/category/mod.rs
index 3f135fd1..dcc9127e 100644
--- a/src/session/model/sidebar_data/category/mod.rs
+++ b/src/session/model/sidebar_data/category/mod.rs
@@ -84,7 +84,7 @@ mod imp {
                                 .map(|target_room_type| (source_room_type, target_room_type))
                         });
 
-                room_types.map_or(false, |(source_room_type, target_room_type)| {
+                room_types.is_some_and(|(source_room_type, target_room_type)| {
                     source_room_type.can_change_to(target_room_type)
                 })
             };
diff --git a/src/session/model/user.rs b/src/session/model/user.rs
index 78ba5a1d..086ef688 100644
--- a/src/session/model/user.rs
+++ b/src/session/model/user.rs
@@ -178,7 +178,7 @@ impl User {
     /// Load whether this user is verified.
     fn init_is_verified(&self) {
         spawn!(clone!(@weak self as obj => async move {
-            let verified = obj.crypto_identity().await.map_or(false, |i| i.is_verified());
+            let verified = obj.crypto_identity().await.is_some_and(|i| i.is_verified());
 
             if verified == obj.verified() {
                 return;
diff --git a/src/session/view/sidebar/mod.rs b/src/session/view/sidebar/mod.rs
index ae0db47b..c4d67b3a 100644
--- a/src/session/view/sidebar/mod.rs
+++ b/src/session/view/sidebar/mod.rs
@@ -143,7 +143,7 @@ mod imp {
                 .focus_child()
                 .and_then(|w| w.focus_child())
                 .and_then(|w| w.focus_child());
-            if focus_child.map_or(false, |w| w.is::<gtk::ListView>())
+            if focus_child.is_some_and(|w| w.is::<gtk::ListView>())
                 && matches!(
                     direction_type,
                     gtk::DirectionType::TabForward | gtk::DirectionType::TabBackward
diff --git a/src/session/view/sidebar/row.rs b/src/session/view/sidebar/row.rs
index aaf79f18..793dc33b 100644
--- a/src/session/view/sidebar/row.rs
+++ b/src/session/view/sidebar/row.rs
@@ -322,14 +322,14 @@ impl Row {
         if let Some(source_type) = source_type {
             if self
                 .room_type()
-                .map_or(false, |row_type| source_type.can_change_to(row_type))
+                .is_some_and(|row_type| source_type.can_change_to(row_type))
             {
                 self.remove_css_class("drop-disabled");
 
                 if self
                     .item()
                     .and_downcast::<Category>()
-                    .map_or(false, |category| category.empty())
+                    .is_some_and(|category| category.empty())
                 {
                     self.add_css_class("drop-empty");
                 } else {