Merge branch 'main' into throttle

Author: aawsome

crates/backend/src/error.rs

@@ -1,3 +1,4 @@
+#![allow(clippy::doc_markdown)]
 use std::{num::TryFromIntError, process::ExitStatus, str::Utf8Error};
 
 use displaydoc::Display;

crates/core/src/archiver.rs

@@ -40,7 +40,7 @@ pub struct Archiver<'a, BE: DecryptFullBackend, I: ReadGlobalIndex> {
     /// The parent snapshot to use.
     parent: Parent,
 
-    /// The SharedIndexer is used to index the data.
+    /// The `SharedIndexer` is used to index the data.
     indexer: SharedIndexer<BE>,
 
     /// The backend to write to.
@@ -49,7 +49,7 @@ pub struct Archiver<'a, BE: DecryptFullBackend, I: ReadGlobalIndex> {
     /// The backend to write to.
     index: &'a I,
 
-    /// The SnapshotFile to write to.
+    /// The `SnapshotFile` to write to.
     snap: SnapshotFile,
 }
 

crates/core/src/archiver/parent.rs

@@ -279,7 +279,7 @@ impl Parent {
                 let parent = match parent {
                     ParentResult::Matched(p_node) => {
                         if p_node.content.iter().flatten().all(|id| index.has_data(id)) {
-                            node.content = p_node.content.clone();
+                            node.content.clone_from(&p_node.content);
                             ParentResult::Matched(())
                         } else {
                             warn!(

crates/core/src/backend/ignore.rs

@@ -167,7 +167,7 @@ impl LocalSource {
             for line in std::fs::read_to_string(file)
                 .map_err(|err| IgnoreErrorKind::ErrorGlob {
                     file: file.into(),
-                    err,
+                    source: err,
                 })?
                 .lines()
             {
@@ -190,7 +190,7 @@ impl LocalSource {
             for line in std::fs::read_to_string(file)
                 .map_err(|err| IgnoreErrorKind::ErrorGlob {
                     file: file.into(),
-                    err,
+                    source: err,
                 })?
                 .lines()
             {
@@ -260,8 +260,13 @@ impl ReadSourceOpen for OpenFile {
     /// [`IgnoreErrorKind::UnableToOpenFile`]: crate::error::IgnoreErrorKind::UnableToOpenFile
     fn open(self) -> RusticResult<Self::Reader> {
         let path = self.0;
-        File::open(&path)
-            .map_err(|err| IgnoreErrorKind::UnableToOpenFile { file: path, err }.into())
+        File::open(&path).map_err(|err| {
+            IgnoreErrorKind::UnableToOpenFile {
+                file: path,
+                source: err,
+            }
+            .into()
+        })
     }
 }
 
@@ -329,7 +334,7 @@ impl Iterator for LocalSourceWalker {
                 self.save_opts.with_atime,
                 self.save_opts.ignore_devid,
             )
-            .map_err(std::convert::Into::into)
+            .map_err(Into::into)
         })
     }
 }
@@ -410,7 +415,7 @@ fn map_entry(
         let path = entry.path();
         let target = read_link(path).map_err(|err| IgnoreErrorKind::ErrorLink {
             path: path.to_path_buf(),
-            err,
+            source: err,
         })?;
         let node_type = NodeType::from_link(&target);
         Node::new_node(name, node_type, meta)
@@ -535,15 +540,15 @@ fn map_entry(
         xattr::list(path)
             .map_err(|err| IgnoreErrorKind::ErrorXattr {
                 path: path.to_path_buf(),
-                err,
+                source: err,
             })?
             .map(|name| {
                 Ok(ExtendedAttribute {
                     name: name.to_string_lossy().to_string(),
                     value: xattr::get(path, name)
                         .map_err(|err| IgnoreErrorKind::ErrorXattr {
                             path: path.to_path_buf(),
-                            err,
+                            source: err,
                         })?
                         .unwrap(),
                 })
@@ -574,7 +579,7 @@ fn map_entry(
         let path = entry.path();
         let target = read_link(path).map_err(|err| IgnoreErrorKind::ErrorLink {
             path: path.to_path_buf(),
-            err,
+            source: err,
         })?;
         let node_type = NodeType::from_link(&target);
         Node::new_node(name, node_type, meta)

crates/core/src/backend/local_destination.rs

@@ -330,7 +330,7 @@ impl LocalDestination {
 
         if let Some(mode) = node.meta.mode {
             let mode = map_mode_from_go(mode);
-            std::fs::set_permissions(filename, fs::Permissions::from_mode(mode))
+            fs::set_permissions(filename, fs::Permissions::from_mode(mode))
                 .map_err(LocalDestinationErrorKind::SettingFilePermissionsFailed)?;
         }
         Ok(())
@@ -390,9 +390,12 @@ impl LocalDestination {
         let filename = self.path(item);
         let mut done = vec![false; extended_attributes.len()];
 
-        for curr_name in xattr::list(&filename)
-            .map_err(|err| LocalDestinationErrorKind::ListingXattrsFailed(err, filename.clone()))?
-        {
+        for curr_name in xattr::list(&filename).map_err(|err| {
+            LocalDestinationErrorKind::ListingXattrsFailed {
+                source: err,
+                path: filename.clone(),
+            }
+        })? {
             match extended_attributes.iter().enumerate().find(
                 |(_, ExtendedAttribute { name, .. })| name == curr_name.to_string_lossy().as_ref(),
             ) {
@@ -660,7 +663,7 @@ impl LocalDestination {
     /// [`LocalDestinationErrorKind::CouldNotWriteToBuffer`]: crate::error::LocalDestinationErrorKind::CouldNotWriteToBuffer
     pub fn write_at(&self, item: impl AsRef<Path>, offset: u64, data: &[u8]) -> RusticResult<()> {
         let filename = self.path(item);
-        let mut file = fs::OpenOptions::new()
+        let mut file = OpenOptions::new()
             .create(true)
             .truncate(false)
             .write(true)

crates/core/src/blob/packer.rs

@@ -160,7 +160,7 @@ impl PackSizer {
 #[allow(clippy::struct_field_names)]
 #[derive(Clone)]
 pub struct Packer<BE: DecryptWriteBackend> {
-    /// The raw packer wrapped in an Arc and RwLock.
+    /// The raw packer wrapped in an `Arc` and `RwLock`.
     // This is a hack: raw_packer and indexer are only used in the add_raw() method.
     // TODO: Refactor as actor, like the other add() methods
     raw_packer: Arc<RwLock<RawPacker<BE>>>,

crates/core/src/blob/tree.rs

@@ -824,7 +824,7 @@ pub(crate) fn merge_trees(
 
     let mut tree_iters: Vec<_> = trees
         .iter()
-        .map(|id| Tree::from_backend(be, index, *id).map(std::iter::IntoIterator::into_iter))
+        .map(|id| Tree::from_backend(be, index, *id).map(IntoIterator::into_iter))
         .collect::<RusticResult<_>>()?;
 
     // fill Heap with first elements from all trees

crates/core/src/commands/config.rs

@@ -125,7 +125,7 @@ pub struct ConfigOptions {
     pub set_treepack_size: Option<ByteSize>,
 
     /// Set upper limit for default packsize for tree packs.
-    /// Note that packs actually can get up to some MiBs larger.
+    /// Note that packs actually can get a bit larger.
     /// If not set, pack sizes can grow up to approximately `4 GiB`.
     #[cfg_attr(feature = "clap", clap(long, value_name = "SIZE"))]
     pub set_treepack_size_limit: Option<ByteSize>,
@@ -151,7 +151,7 @@ pub struct ConfigOptions {
     pub set_datapack_growfactor: Option<u32>,
 
     /// Set upper limit for default packsize for tree packs.
-    /// Note that packs actually can get up to some MiBs larger.
+    /// Note that packs actually can get a bit larger.
     /// If not set, pack sizes can grow up to approximately `4 GiB`.
     #[cfg_attr(feature = "clap", clap(long, value_name = "SIZE"))]
     pub set_datapack_size_limit: Option<ByteSize>,

crates/core/src/commands/repair/index.rs

@@ -85,21 +85,21 @@ impl RepairIndexOptions {
         );
         for (id, size_hint, packsize) in pack_read_header {
             debug!("reading pack {id}...");
-            let pack = IndexPack {
-                id,
-                blobs: match PackHeader::from_file(be, id, size_hint, packsize) {
-                    Err(err) => {
-                        warn!("error reading pack {id} (not processed): {err}");
-                        Vec::new()
+            match PackHeader::from_file(be, id, size_hint, packsize) {
+                Err(err) => {
+                    warn!("error reading pack {id} (-> removing from index): {err}");
+                }
+                Ok(header) => {
+                    let pack = IndexPack {
+                        blobs: header.into_blobs(),
+                        id,
+                        ..Default::default()
+                    };
+                    if !dry_run {
+                        // write pack file to index - without the delete mark
+                        indexer.write().unwrap().add_with(pack, false)?;
                     }
-                    Ok(header) => header.into_blobs(),
-                },
-                ..Default::default()
-            };
-
-            if !dry_run {
-                // write pack file to index - without the delete mark
-                indexer.write().unwrap().add_with(pack, false)?;
+                }
             }
             p.inc(1);
         }

crates/core/src/commands/restore.rs

@@ -595,7 +595,7 @@ impl BlobLocation {
         self.uncompressed_length
             .map_or(
                 self.length - 32, // crypto overhead
-                std::num::NonZeroU32::get,
+                NonZeroU32::get,
             )
             .into()
     }