From ab0418988748af508f461c7712f3a83ed36d11a7 Mon Sep 17 00:00:00 2001
From: Manos Pitsidianakis <manos@pitsidianak.is>
Date: Sat, 4 May 2024 11:19:32 +0300
Subject: [PATCH] clippy: fix new warnings for 1.78.0

Signed-off-by: Manos Pitsidianakis <manos@pitsidianak.is>
---
 meli/src/conf.rs              |  2 +-
 meli/src/utilities.rs         |  2 +-
 melib/src/addressbook/mutt.rs |  2 +-
 melib/src/email/parser.rs     | 25 ++++++++++----------
 melib/src/jmap/connection.rs  |  6 ++++-
 melib/src/thread.rs           | 44 +++++++++++++++++------------------
 6 files changed, 43 insertions(+), 38 deletions(-)

diff --git a/meli/src/conf.rs b/meli/src/conf.rs
index 2c4a9e16..0e1f5c93 100644
--- a/meli/src/conf.rs
+++ b/meli/src/conf.rs
@@ -610,7 +610,7 @@ impl Settings {
 
         for (id, x) in fs.accounts {
             let mut ac = AccountConf::from(x);
-            ac.account.name = id.clone();
+            ac.account.name.clone_from(&id);
 
             s.insert(id, ac);
         }
diff --git a/meli/src/utilities.rs b/meli/src/utilities.rs
index 86326c46..463e68f2 100644
--- a/meli/src/utilities.rs
+++ b/meli/src/utilities.rs
@@ -717,7 +717,7 @@ impl Component for StatusBar {
                 self.dirty = true;
             }
             UIEvent::StatusEvent(StatusEvent::BufSet(s)) => {
-                self.display_buffer = s.clone();
+                self.display_buffer.clone_from(s);
                 self.dirty = true;
             }
             UIEvent::StatusEvent(StatusEvent::UpdateStatus(ref mut s)) => {
diff --git a/melib/src/addressbook/mutt.rs b/melib/src/addressbook/mutt.rs
index 71dbb0ae..5b9ea4e7 100644
--- a/melib/src/addressbook/mutt.rs
+++ b/melib/src/addressbook/mutt.rs
@@ -70,7 +70,7 @@ pub fn parse_mutt_contact<'a>() -> impl Parser<'a, Card> {
                 });
                 name.pop();
                 if name.trim().is_empty() {
-                    name = title.clone();
+                    name.clone_from(&title);
                 }
                 ret.set_title(title).set_email(email).set_name(name);
                 Ok::<Card, &'a str>(ret)
diff --git a/melib/src/email/parser.rs b/melib/src/email/parser.rs
index 879493ef..767477e0 100644
--- a/melib/src/email/parser.rs
+++ b/melib/src/email/parser.rs
@@ -106,17 +106,18 @@ impl std::fmt::Debug for ParsingError<&'_ str> {
     }
 }
 
-struct DebugOkWrapper<'r, I, R: AsRef<[u8]>>(&'r IResult<I, R>);
-
-impl<R: AsRef<[u8]> + std::fmt::Debug> std::fmt::Debug for DebugOkWrapper<'_, &'_ [u8], R> {
-    fn fmt(&self, fmt: &mut std::fmt::Formatter) -> std::fmt::Result {
-        if let Ok((a, b)) = self.0 {
-            write!(fmt, "Ok({}, {})", &to_str!(a), &to_str!(b.as_ref()))
-        } else {
-            write!(fmt, "{:?}", self.0)
-        }
-    }
-}
+// For debugging.
+// struct DebugOkWrapper<'r, I, R: AsRef<[u8]>>(&'r IResult<I, R>);
+
+// impl<R: AsRef<[u8]> + std::fmt::Debug> std::fmt::Debug for DebugOkWrapper<'_,
+// &'_ [u8], R> {     fn fmt(&self, fmt: &mut std::fmt::Formatter) ->
+// std::fmt::Result {         if let Ok((a, b)) = self.0 {
+//             write!(fmt, "Ok({}, {})", &to_str!(a), &to_str!(b.as_ref()))
+//         } else {
+//             write!(fmt, "{:?}", self.0)
+//         }
+//     }
+// }
 
 pub type IResult<I, O, E = ParsingError<I>> = std::result::Result<(I, O), nom::Err<E>>;
 
@@ -2156,7 +2157,7 @@ pub mod encodings {
         let s: Vec<u8> = match input[tag_end_idx + 1] {
             b'b' | b'B' => BASE64_MIME
                 .decode(encoded_text)
-                .map_or_else(|_| encoded_text.to_vec(), |v| v),
+                .unwrap_or_else(|_| encoded_text.to_vec()),
             b'q' | b'Q' => match quoted_printable_bytes_header(encoded_text) {
                 Ok((b"", s)) => s,
                 _ => {
diff --git a/melib/src/jmap/connection.rs b/melib/src/jmap/connection.rs
index 0b811676..bd56443c 100644
--- a/melib/src/jmap/connection.rs
+++ b/melib/src/jmap/connection.rs
@@ -229,7 +229,11 @@ impl JmapConnection {
             return Err(err);
         }
 
-        *self.store.core_capabilities.lock().unwrap() = session.capabilities.clone();
+        self.store
+            .core_capabilities
+            .lock()
+            .unwrap()
+            .clone_from(&session.capabilities);
         let mail_account_id = session.mail_account_id();
         _ = self
             .store
diff --git a/melib/src/thread.rs b/melib/src/thread.rs
index ebd0b2fb..c33d44ae 100644
--- a/melib/src/thread.rs
+++ b/melib/src/thread.rs
@@ -1480,28 +1480,28 @@ fn print_threadnodes(
 }
 */
 
-#[derive(Serialize)]
-struct Node {
-    id: String,
-    subject: String,
-    from: String,
-    to: String,
-    date: UnixTimestamp,
-    references: String,
-    in_reply_to: String,
-}
-
-#[derive(Serialize)]
-struct Link {
-    source: String,
-    target: String,
-}
-
-#[derive(Serialize)]
-struct Graph {
-    nodes: Vec<Node>,
-    links: Vec<Link>,
-}
+// #[derive(Serialize)]
+// struct Node {
+//     id: String,
+//     subject: String,
+//     from: String,
+//     to: String,
+//     date: UnixTimestamp,
+//     references: String,
+//     in_reply_to: String,
+// }
+
+// #[derive(Serialize)]
+// struct Link {
+//     source: String,
+//     target: String,
+// }
+
+// #[derive(Serialize)]
+// struct Graph {
+//     nodes: Vec<Node>,
+//     links: Vec<Link>,
+// }
 
 /*
 fn save_graph(