From cc3829816326c5dfd46f1419e28133a32000b46c Mon Sep 17 00:00:00 2001
From: link2xt <link2xt@testrun.org>
Date: Thu, 5 Feb 2026 20:38:46 +0000
Subject: [PATCH] refactor: enable clippy::manual_is_variant_and

---
 src/config.rs | 3 +--
 src/imap.rs   | 5 ++---
 src/lib.rs    | 3 ++-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/config.rs b/src/config.rs
index ef7bf3269..adba3f610 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -591,8 +591,7 @@ impl Context {
             .get_config(key)
             .await?
             .and_then(|s| s.parse::<i32>().ok())
-            .map(|x| x != 0)
-            .unwrap_or_default())
+            .is_some_and(|x| x != 0))
     }
 
     /// Returns true if movebox ("DeltaChat" folder) should be watched.
diff --git a/src/imap.rs b/src/imap.rs
index 4365cb6a2..430ce4420 100644
--- a/src/imap.rs
+++ b/src/imap.rs
@@ -2152,11 +2152,10 @@ pub(crate) async fn prefetch_should_download(
     let accepted_contact = origin.is_known();
     let is_reply_to_chat_message = get_prefetch_parent_message(context, headers)
         .await?
-        .map(|parent| match parent.is_dc_message {
+        .is_some_and(|parent| match parent.is_dc_message {
             MessengerMessage::No => false,
             MessengerMessage::Yes | MessengerMessage::Reply => true,
-        })
-        .unwrap_or_default();
+        });
 
     let show_emails =
         ShowEmails::from_i32(context.get_config_int(Config::ShowEmails).await?).unwrap_or_default();
diff --git a/src/lib.rs b/src/lib.rs
index 382e4de96..0494e96d3 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -14,7 +14,8 @@
     clippy::unused_async,
     clippy::explicit_iter_loop,
     clippy::explicit_into_iter_loop,
-    clippy::cloned_instead_of_copied
+    clippy::cloned_instead_of_copied,
+    clippy::manual_is_variant_and
 )]
 #![cfg_attr(not(test), forbid(clippy::indexing_slicing))]
 #![cfg_attr(not(test), forbid(clippy::string_slice))]