From 09948845caec95d9ceda7686b7dcef302920dc46 Mon Sep 17 00:00:00 2001
From: Jordan Petridis <jpetridis@gnome.org>
Date: Sun, 2 Sep 2018 23:43:41 +0300
Subject: [PATCH] Pipeline: Remove use of clone! macro

---
 podcasts-data/src/pipeline.rs | 37 +++++++----------------------------
 1 file changed, 7 insertions(+), 30 deletions(-)

diff --git a/podcasts-data/src/pipeline.rs b/podcasts-data/src/pipeline.rs
index 34ce165..89200fd 100644
--- a/podcasts-data/src/pipeline.rs
+++ b/podcasts-data/src/pipeline.rs
@@ -16,27 +16,6 @@ use num_cpus;
 use errors::DataError;
 use Source;
 
-// use std::sync::{Arc, Mutex};
-
-// http://gtk-rs.org/tuto/closures
-#[macro_export]
-macro_rules! clone {
-    (@param _) => ( _ );
-    (@param $x:ident) => ( $x );
-    ($($n:ident),+ => move || $body:expr) => (
-        {
-            $( let $n = $n.clone(); )+
-            move || $body
-        }
-    );
-    ($($n:ident),+ => move |$($p:tt),+| $body:expr) => (
-        {
-            $( let $n = $n.clone(); )+
-            move |$(clone!(@param $p),)+| $body
-        }
-    );
-}
-
 type HttpsClient = Client<HttpsConnector<HttpConnector>>;
 
 /// The pipline to be run for indexing and updating a Podcast feed that originates from
@@ -47,19 +26,19 @@ type HttpsClient = Client<HttpsConnector<HttpConnector>>;
 /// Convert `rss::Channel` into `Feed` -> Index Podcast -> Index Episodes.
 pub fn pipeline<'a, S>(
     sources: S,
-    client: &HttpsClient,
-    pool: &tokio_threadpool::Sender,
+    client: HttpsClient,
+    pool: tokio_threadpool::Sender,
 ) -> impl Future<Item = Vec<()>, Error = DataError> + 'a
 where
     S: Stream<Item = Source, Error = DataError> + 'a,
 {
     sources
-        .and_then(clone!(client => move |s| s.into_feed(client.clone())))
-        .and_then(clone!(pool => move |feed| {
+        .and_then(move |s| s.into_feed(client.clone()))
+        .and_then(move |feed| {
             pool.spawn(lazy(|| {
                 feed.index().map_err(|err| error!("Error: {}", err))
             })).map_err(From::from)
-        }))
+        })
         // the stream will stop at the first error so
         // we ensure that everything will succeded regardless.
         .map_err(|err| error!("Error: {}", err))
@@ -74,6 +53,7 @@ where
     S: IntoIterator<Item = Source>,
 {
     let pool = ThreadPool::new();
+    let sender = pool.sender().clone();
     let mut core = Core::new()?;
     let handle = core.handle();
     let client = Client::configure()
@@ -81,10 +61,7 @@ where
         .build(&handle);
 
     let stream = iter_ok::<_, DataError>(sources);
-    let p = {
-        let sender = pool.sender();
-        pipeline(stream, &client, &sender)
-    };
+    let p = pipeline(stream, client, sender);
     core.run(p)?;
 
     pool.shutdown_on_idle().wait().unwrap();