Do not pass progress bars by value, but by reference

Because passing by value is simply not necessary here.

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>

7 files changed, 17 insertions, 17 deletions

diff --git a/src/commands/build.rs b/src/commands/build.rs
index 85697d6..421f7ee 100644
--- a/src/commands/build.rs
+++ b/src/commands/build.rs
@@ -163,7 +163,7 @@ pub async fn build(
 
             let p = config.releases_directory().join(storename);
             debug!("Loading release directory: {}", p.display());
-            let r = ReleaseStore::load(StoreRoot::new(p)?, bar_release_loading.clone());
+            let r = ReleaseStore::load(StoreRoot::new(p)?, &bar_release_loading);
             if r.is_ok() {
                 bar_release_loading.finish_with_message("Loaded releases successfully");
             } else {
@@ -208,7 +208,7 @@ pub async fn build(
         }
 
         debug!("Loading staging directory: {}", p.display());
-        let r = StagingStore::load(StoreRoot::new(p.clone())?, bar_staging_loading.clone());
+        let r = StagingStore::load(StoreRoot::new(p.clone())?, &bar_staging_loading);
         if r.is_ok() {
             bar_staging_loading.finish_with_message("Loaded staging successfully");
         } else {
@@ -220,7 +220,7 @@ pub async fn build(
     let dag = {
         let bar_tree_building = progressbars.bar();
         bar_tree_building.set_length(max_packages);
-        let dag = Dag::for_root_package(package.clone(), &repo, bar_tree_building.clone())?;
+        let dag = Dag::for_root_package(package.clone(), &repo, &bar_tree_building)?;
         bar_tree_building.finish_with_message("Finished loading Dag");
         dag
     };
diff --git a/src/commands/find_artifact.rs b/src/commands/find_artifact.rs
index 93b332b..469fb6e 100644
--- a/src/commands/find_artifact.rs
+++ b/src/commands/find_artifact.rs
@@ -59,7 +59,7 @@ pub async fn find_artifact(matches: &ArgMatches, config: &Configuration, progres
 
             let p = config.releases_directory().join(storename);
             debug!("Loading release directory: {}", p.display());
-            let r = ReleaseStore::load(StoreRoot::new(p)?, bar_release_loading.clone());
+            let r = ReleaseStore::load(StoreRoot::new(p)?, &bar_release_loading);
             if r.is_ok() {
                 bar_release_loading.finish_with_message("Loaded releases successfully");
             } else {
@@ -79,7 +79,7 @@ pub async fn find_artifact(matches: &ArgMatches, config: &Configuration, progres
         }
 
         debug!("Loading staging directory: {}", p.display());
-        let r = StagingStore::load(StoreRoot::new(p.clone())?, bar_staging_loading.clone());
+        let r = StagingStore::load(StoreRoot::new(p.clone())?, &bar_staging_loading);
         if r.is_ok() {
             bar_staging_loading.finish_with_message("Loaded staging successfully");
         } else {
diff --git a/src/commands/tree_of.rs b/src/commands/tree_of.rs
index df3a6cf..30196b7 100644
--- a/src/commands/tree_of.rs
+++ b/src/commands/tree_of.rs
@@ -45,7 +45,7 @@ pub async fn tree_of(
         })
         .map(|package| {
             let bar_tree_building = progressbars.bar();
-            let tree = Dag::for_root_package(package.clone(), &repo, bar_tree_building.clone())?;
+            let tree = Dag::for_root_package(package.clone(), &repo, &bar_tree_building)?;
             bar_tree_building.finish_with_message("Finished loading Tree");
             Ok(tree)
         })
diff --git a/src/filestore/release.rs b/src/filestore/release.rs
index a30c86e..a990821 100644
--- a/src/filestore/release.rs
+++ b/src/filestore/release.rs
@@ -27,7 +27,7 @@ impl Debug for ReleaseStore {
 }
 
 impl ReleaseStore {
-    pub fn load(root: StoreRoot, progress: ProgressBar) -> Result<Self> {
+    pub fn load(root: StoreRoot, progress: &ProgressBar) -> Result<Self> {
         FileStoreImpl::load(root, progress).map(ReleaseStore)
     }
 
diff --git a/src/filestore/staging.rs b/src/filestore/staging.rs
index 1c2a848..9e98e25 100644
--- a/src/filestore/staging.rs
+++ b/src/filestore/staging.rs
@@ -33,7 +33,7 @@ impl Debug for StagingStore {
 }
 
 impl StagingStore {
-    pub fn load(root: StoreRoot, progress: ProgressBar) -> Result<Self> {
+    pub fn load(root: StoreRoot, progress: &ProgressBar) -> Result<Self> {
         FileStoreImpl::load(root, progress).map(StagingStore)
     }
 
diff --git a/src/filestore/util.rs b/src/filestore/util.rs
index 53f5919..ec6ecfd 100644
--- a/src/filestore/util.rs
+++ b/src/filestore/util.rs
@@ -31,8 +31,8 @@ pub struct FileStoreImpl {
 }
 
 impl FileStoreImpl {
-    /// Loads the passed path recursively 
-    pub fn load(root: StoreRoot, progress: ProgressBar) -> Result<Self> {
+    /// Loads the passed path recursively
+    pub fn load(root: StoreRoot, progress: &ProgressBar) -> Result<Self> {
         let store = root
             .find_artifacts_recursive()
             .inspect(|path| {
diff --git a/src/package/dag.rs b/src/package/dag.rs
index 7ad475b..e7b8dc3 100644
--- a/src/package/dag.rs
+++ b/src/package/dag.rs
@@ -40,7 +40,7 @@ impl Dag {
     pub fn for_root_package(
         p: Package,
         repo: &Repository,
-        progress: ProgressBar,
+        progress: &ProgressBar,
     ) -> Result<Self> {
         fn add_sub_packages<'a>(
             repo: &'a Repository,
@@ -100,7 +100,7 @@ impl Dag {
         trace!("Making package Tree for {:?}", p);
         let root_idx = dag.add_node(&p);
         mappings.insert(&p, root_idx);
-        add_sub_packages(repo, &mut mappings, &mut dag, &p, &progress)?;
+        add_sub_packages(repo, &mut mappings, &mut dag, &p, progress)?;
         add_edges(&mappings, &mut dag)?;
         trace!("Finished makeing package Tree");
 
@@ -179,7 +179,7 @@ mod tests {
         let repo = Repository::from(btree);
         let progress = ProgressBar::hidden();
 
-        let r = Dag::for_root_package(p1, &repo, progress);
+        let r = Dag::for_root_package(p1, &repo, &progress);
         assert!(r.is_ok());
     }
 
@@ -211,7 +211,7 @@ mod tests {
         let repo = Repository::from(btree);
         let progress = ProgressBar::hidden();
 
-        let dag = Dag::for_root_package(p1, &repo, progress);
+        let dag = Dag::for_root_package(p1, &repo, &progress);
         assert!(dag.is_ok());
         let dag = dag.unwrap();
         let ps = dag.all_packages();
@@ -300,7 +300,7 @@ mod tests {
         let repo = Repository::from(btree);
         let progress = ProgressBar::hidden();
 
-        let r = Dag::for_root_package(p1, &repo, progress);
+        let r = Dag::for_root_package(p1, &repo, &progress);
         assert!(r.is_ok());
         let r = r.unwrap();
         let ps = r.all_packages();
@@ -443,7 +443,7 @@ mod tests {
         let repo = Repository::from(btree);
         let progress = ProgressBar::hidden();
 
-        let r = Dag::for_root_package(p1, &repo, progress);
+        let r = Dag::for_root_package(p1, &repo, &progress);
         assert!(r.is_ok());
         let r = r.unwrap();
         let ps = r.all_packages();
@@ -548,7 +548,7 @@ mod tests {
         let repo = Repository::from(btree);
         let progress = ProgressBar::hidden();
 
-        let r = Dag::for_root_package(p1, &repo, progress);
+        let r = Dag::for_root_package(p1, &repo, &progress);
         assert!(r.is_ok());
         let r = r.unwrap();
         let ps = r.all_packages();