From 6a5efb10528696454afbf231c098e16812efb1cf Mon Sep 17 00:00:00 2001
From: Thomas <48214567+ThomasFrans@users.noreply.github.com>
Date: Wed, 19 Oct 2022 22:02:39 +0200
Subject: [PATCH] Fix `Clone` impl marked todo on Pagination

- Fixed a manual implementation of Clone on Pagination (needed extra
  trait bounds to be derivable)
- Made clippy happy :)
---
 src/ui/layout.rs         |  2 +-
 src/ui/listview.rs       |  4 ++--
 src/ui/pagination.rs     | 15 ++-------------
 src/ui/search_results.rs |  2 +-
 4 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/src/ui/layout.rs b/src/ui/layout.rs
index a026f4c..a215ea1 100644
--- a/src/ui/layout.rs
+++ b/src/ui/layout.rs
@@ -82,7 +82,7 @@ impl Layout {
     }
 
     pub fn screen<S: Into<String>, T: IntoBoxedViewExt>(mut self, id: S, view: T) -> Self {
-        (&mut self).add_screen(id, view);
+        self.add_screen(id, view);
         self
     }
 
diff --git a/src/ui/listview.rs b/src/ui/listview.rs
index db9992f..555002e 100644
--- a/src/ui/listview.rs
+++ b/src/ui/listview.rs
@@ -57,7 +57,7 @@ impl<I: ListItem> Scroller for ListView<I> {
     }
 }
 
-impl<I: ListItem> ListView<I> {
+impl<I: ListItem + Clone> ListView<I> {
     pub fn new(content: Arc<RwLock<Vec<I>>>, queue: Arc<Queue>, library: Arc<Library>) -> Self {
         let result = Self {
             content,
@@ -178,7 +178,7 @@ impl<I: ListItem> ListView<I> {
     }
 }
 
-impl<I: ListItem> View for ListView<I> {
+impl<I: ListItem + Clone> View for ListView<I> {
     fn draw(&self, printer: &Printer<'_, '_>) {
         let content = self.content.read().unwrap();
 
diff --git a/src/ui/pagination.rs b/src/ui/pagination.rs
index 6367059..ce05bbb 100644
--- a/src/ui/pagination.rs
+++ b/src/ui/pagination.rs
@@ -92,6 +92,7 @@ pub type Paginator<I> = Box<dyn Fn(Arc<RwLock<Vec<I>>>) + Send + Sync>;
 /// `max_content`: The maximum amount of items
 /// `callback`: TODO: document
 /// `busy`: TODO: document
+#[derive(Clone)]
 pub struct Pagination<I: ListItem> {
     loaded_content: Arc<RwLock<usize>>,
     max_content: Arc<RwLock<Option<usize>>>,
@@ -110,19 +111,7 @@ impl<I: ListItem> Default for Pagination<I> {
     }
 }
 
-// TODO: figure out why deriving Clone doesn't work
-impl<I: ListItem> Clone for Pagination<I> {
-    fn clone(&self) -> Self {
-        Pagination {
-            loaded_content: self.loaded_content.clone(),
-            max_content: self.max_content.clone(),
-            callback: self.callback.clone(),
-            busy: self.busy.clone(),
-        }
-    }
-}
-
-impl<I: ListItem> Pagination<I> {
+impl<I: ListItem + Clone> Pagination<I> {
     pub fn clear(&mut self) {
         *self.max_content.write().unwrap() = None;
         *self.callback.write().unwrap() = None;
diff --git a/src/ui/search_results.rs b/src/ui/search_results.rs
index c88d363..c2f13ec 100644
--- a/src/ui/search_results.rs
+++ b/src/ui/search_results.rs
@@ -348,7 +348,7 @@ impl SearchResultsView {
         0
     }
 
-    fn perform_search<I: ListItem>(
+    fn perform_search<I: ListItem + Clone>(
         &self,
         handler: SearchHandler<I>,
         results: &Arc<RwLock<Vec<I>>>,