impl Clone for BandId

Author: sourcefrog

src/archive.rs

@@ -150,7 +150,7 @@ impl Archive {
         match band_selection {
             BandSelectionPolicy::LatestClosed => self
                 .last_complete_band()?
-                .map(|band| band.id().clone())
+                .map(|band| *band.id())
                 .ok_or(anyhow!("Archive has no complete bands")),
             BandSelectionPolicy::Specified(band_id) => Ok(band_id),
             BandSelectionPolicy::Latest => self.last_band_id()?.ok_or(anyhow!("Archive is empty")),
@@ -392,7 +392,7 @@ impl Archive {
                     ..
                 }) => {
                     if let Ok(band_id) = name.parse::<BandId>() {
-                        if !seen_bands.insert(band_id.clone()) {
+                        if !seen_bands.insert(band_id) {
                             // TODO: Test this
                             error!(%band_id, "Duplicated band directory");
                         }

src/band.rs

@@ -261,7 +261,7 @@ impl Band {
             .transpose()
             .context("invalid end timestamp {tail.end_time:?}")?;
         Ok(Info {
-            id: self.band_id.clone(),
+            id: self.band_id,
             is_closed: tail_option.is_some(),
             start_time,
             end_time,

src/bandid.rs

@@ -21,7 +21,7 @@ use serde::Serialize;
 use crate::errors::Error;
 
 /// Identifier for a band within an archive, eg 'b0001'.
-#[derive(Debug, PartialEq, Clone, Eq, PartialOrd, Ord, Hash, Serialize)]
+#[derive(Debug, PartialEq, Clone, Copy, Eq, PartialOrd, Ord, Hash, Serialize)]
 pub struct BandId(u32);
 
 impl BandId {

src/bin/conserve.rs

@@ -542,7 +542,7 @@ fn stored_tree_from_opt(
 
 fn band_selection_policy_from_opt(backup: &Option<BandId>) -> BandSelectionPolicy {
     if let Some(band_id) = backup {
-        BandSelectionPolicy::Specified(band_id.clone())
+        BandSelectionPolicy::Specified(*band_id)
     } else {
         BandSelectionPolicy::Latest
     }

src/gc_lock.rs

@@ -57,7 +57,7 @@ impl GarbageCollectionLock {
     pub fn new(archive: &Archive) -> anyhow::Result<GarbageCollectionLock> {
         let archive = archive.clone();
         let band_id = archive.last_band_id()?;
-        if let Some(band_id) = band_id.clone() {
+        if let Some(band_id) = band_id {
             if !archive.band_is_closed(&band_id)? {
                 bail!("Can't delete blocks because the last band ({band_id}) is incomplete and may be in use" );
             }

src/show.rs

@@ -108,7 +108,7 @@ pub fn show_versions(
         if options.tree_size {
             let tree_mb_str = crate::misc::bytes_to_human_mb(
                 archive
-                    .open_stored_tree(BandSelectionPolicy::Specified(band_id.clone()))?
+                    .open_stored_tree(BandSelectionPolicy::Specified(band_id))?
                     .size(Exclude::nothing())?
                     .file_bytes,
             );

src/stitch.rs

@@ -132,7 +132,7 @@ impl Iterator for IterStitchedIndexHunks {
 }
 
 fn previous_existing_band(archive: &Archive, band_id: &BandId) -> Option<BandId> {
-    let mut band_id = band_id.clone();
+    let mut band_id = *band_id;
     loop {
         // TODO: It might be faster to list the present bands and calculate
         // from that, rather than walking backwards one at a time...
@@ -166,7 +166,7 @@ mod test {
     }
 
     fn simple_ls(archive: &Archive, band_id: &BandId) -> String {
-        let strs: Vec<String> = IterStitchedIndexHunks::new(archive, Some(band_id.clone()))
+        let strs: Vec<String> = IterStitchedIndexHunks::new(archive, Some(*band_id))
             .flatten()
             .map(|entry| format!("{}:{}", &entry.apath, entry.target.unwrap()))
             .collect();
@@ -282,7 +282,7 @@ mod test {
 
         let band_id = band_ids.first().expect("expected at least one band");
 
-        let mut iter = IterStitchedIndexHunks::new(&af, Some(band_id.clone()));
+        let mut iter = IterStitchedIndexHunks::new(&af, Some(*band_id));
         // Get the first and only index entry.
         // `index_hunks` and `band_id` should be `Some`.
         assert!(iter.next().is_some());

src/stored_tree.rs

@@ -63,7 +63,7 @@ impl ReadTree for StoredTree {
     // TODO: Should return an iter of Result<Entry> so that we can inspect them...
     fn iter_entries(&self, subtree: Apath, exclude: Exclude) -> anyhow::Result<Self::IT> {
         Ok(
-            IterStitchedIndexHunks::new(&self.archive, Some(self.band.id().clone()))
+            IterStitchedIndexHunks::new(&self.archive, Some(*self.band.id()))
                 .iter_entries(subtree, exclude),
         )
     }

src/validate.rs

@@ -54,7 +54,7 @@ pub(crate) fn validate_bands(
             continue 'band;
         };
         if let Err(err) = archive
-            .open_stored_tree(BandSelectionPolicy::Specified(band_id.clone()))
+            .open_stored_tree(BandSelectionPolicy::Specified(*band_id))
             .and_then(|st| validate_stored_tree(&st))
             .map(|st_block_lens| merge_block_lens(&mut block_lens, &st_block_lens))
         {