From 1e135de443fffab32e6807939a3139474426f209 Mon Sep 17 00:00:00 2001
From: Henrik Friedrichsen <henrik@affekt.org>
Date: Sun, 31 Jul 2022 11:32:59 +0200
Subject: [PATCH] Apply `cargo clippy` suggestions

---
 src/sharing.rs        | 12 ++----------
 src/ui/contextmenu.rs |  2 +-
 src/ui/library.rs     |  7 +------
 src/utils.rs          |  4 +++-
 4 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/src/sharing.rs b/src/sharing.rs
index 69cecec..4adc9f5 100644
--- a/src/sharing.rs
+++ b/src/sharing.rs
@@ -152,11 +152,7 @@ pub fn write_share(url: String) -> Option<()> {
                 )
                 .ok()
         }
-        if let Some(o) = option {
-            Some(o)
-        } else {
-            None
-        }
+        option
     } else {
         //use x11 clipboard
         ClipboardProvider::new()
@@ -182,11 +178,7 @@ pub fn write_share(url: String) -> Option<()> {
                 )
                 .ok()
         }
-        if let Some(o) = option {
-            Some(o)
-        } else {
-            None
-        }
+        option
     } else {
         //use x11 clipboard
         ClipboardProvider::new()
diff --git a/src/ui/contextmenu.rs b/src/ui/contextmenu.rs
index cb377c2..68be1a6 100644
--- a/src/ui/contextmenu.rs
+++ b/src/ui/contextmenu.rs
@@ -210,7 +210,7 @@ impl ContextMenu {
         let dialog = Dialog::new()
             .title(format!(
                 "Select action for artist: {}",
-                artist.clone().name.as_str()
+                artist.name.as_str()
             ))
             .dismiss_button("Cancel")
             .padding(Margins::lrtb(1, 1, 1, 0))
diff --git a/src/ui/library.rs b/src/ui/library.rs
index e47af84..78e5392 100644
--- a/src/ui/library.rs
+++ b/src/ui/library.rs
@@ -62,12 +62,7 @@ impl LibraryView {
         Self {
             tabs: tabview,
             display_name: {
-                let hide_username = library
-                    .cfg
-                    .values()
-                    .hide_display_names
-                    .clone()
-                    .unwrap_or(false);
+                let hide_username = library.cfg.values().hide_display_names.unwrap_or(false);
                 if hide_username {
                     None
                 } else {
diff --git a/src/utils.rs b/src/utils.rs
index 1fdc811..7c8d7cf 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -1,5 +1,7 @@
 #![allow(dead_code)]
 
+use std::fmt::Write;
+
 /// Returns a human readable String of a Duration
 ///
 /// Example: `3h 12m 53s`
@@ -7,7 +9,7 @@ pub fn format_duration(d: &std::time::Duration) -> String {
     let mut s = String::new();
     let mut append_unit = |value, unit| {
         if value > 0 {
-            s.push_str(&format!("{}{}", value, unit));
+            let _ = write!(s, "{}{}", value, unit);
         }
     };