Merge branch 'main' into fix/create-directories

rustic-rs · Nov 17, 2024 · 1443a6b · 1443a6b
2 parents 0583d0a + c6722b0
commit 1443a6b
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 393 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml
@@ -66,6 +66,7 @@ scrypt = { version = "0.11.0", default-features = false, features = ["std"] } #
 binrw = "0.14.0"
 hex = { version = "0.4.3", features = ["serde"] }
 integer-sqrt = "0.1.5"
+rustic_cdc = "0.3.1"
 serde = { version = "1.0.210" }
 serde-aux = "4.5.0"
 serde_derive = "1.0.210"

diff --git a/crates/core/src/archiver/file_archiver.rs b/crates/core/src/archiver/file_archiver.rs
@@ -1,5 +1,7 @@
 use std::io::Read;
 
+use rustic_cdc::Rabin64;
+
 use crate::{
     archiver::{
         parent::{ItemWithParent, ParentResult},
@@ -15,7 +17,6 @@ use crate::{
         packer::{Packer, PackerStats},
         BlobId, BlobType, DataId,
     },
-    cdc::rolling_hash::Rabin64,
     chunker::ChunkIter,
     crypto::hasher::hash,
     error::{ErrorKind, RusticError, RusticResult},
@@ -73,7 +74,7 @@ impl<'a, BE: DecryptWriteBackend, I: ReadGlobalIndex> FileArchiver<'a, BE, I> {
             index.total_size(BlobType::Data),
         )?;
 
-        let rabin = Rabin64::new_with_polynom(6, poly);
+        let rabin = Rabin64::new_with_polynom(6, &poly);
 
         Ok(Self {
             index,

diff --git a/crates/core/src/cdc.rs b/crates/core/src/cdc.rs
diff --git a/crates/core/src/cdc/LICENSE.txt b/crates/core/src/cdc/LICENSE.txt
diff --git a/crates/core/src/cdc/README.md b/crates/core/src/cdc/README.md
diff --git a/crates/core/src/cdc/polynom.rs b/crates/core/src/cdc/polynom.rs