Update pijul

Author: fossdd

Cargo.lock

@@ -112,11 +112,11 @@ diffs = "0.4"
 toml = "0.5"
 serde_json = "1.0"
 lazy_static = "1.4"
-xxhash-rust = { version = "0.8.2", features = [ "xxh64" ] }
+twox-hash = "1.6"
 crossbeam-deque = "0.8"
 crossbeam-utils = "0.8"
 
-zstd-seekable = { version = "0.2.0", optional = true }
+zstd-seekable = { version = "0.1.7", optional = true }
 cfg-if = "1.0"
 memchr = "2.4"
 

libpijul/Cargo.toml

@@ -2,8 +2,8 @@ use super::*;
 
 /// An open, seekable change file.
 #[cfg(feature = "zstd")]
-pub struct ChangeFile {
-    s: Option<zstd_seekable::Seekable<OffFile>>,
+pub struct ChangeFile<'a> {
+    s: Option<zstd_seekable::Seekable<'a, OffFile>>,
     hashed: Hashed<Hunk<Option<Hash>, Local>, Author>,
     hash: Hash,
     unhashed: Option<toml::Value>,
@@ -34,7 +34,7 @@ impl std::io::Seek for OffFile {
 }
 
 #[cfg(feature = "zstd")]
-impl ChangeFile {
+impl<'a> ChangeFile<'a> {
     /// Open a change file from a path.
     pub fn open(hash: Hash, path: &str) -> Result<Self, ChangeError> {
         use std::io::Read;
@@ -84,13 +84,10 @@ impl ChangeFile {
         let s = if offsets.contents_off >= m.len() {
             None
         } else {
-            Some(zstd_seekable::Seekable::init(
-                OffFile {
-                    f: r,
-                    start: offsets.contents_off,
-                },
-                None,
-            )?)
+            Some(zstd_seekable::Seekable::init(Box::new(OffFile {
+                f: r,
+                start: offsets.contents_off,
+            }))?)
         };
         Ok(ChangeFile {
             s,

libpijul/src/change/change_file.rs

@@ -355,7 +355,6 @@ impl Hunk<Option<Hash>, Local> {
         change_contents: &[u8],
         mut w: &mut W,
     ) -> Result<(), TextSerError<C::Error>> {
-
         // let file_name = |local: &Local, _| -> String { format!("{}:{}", local.path, local.line) };
 
         use self::text_changes::*;

libpijul/src/change/text_changes.rs

@@ -6,7 +6,7 @@ use std::path::{Path, PathBuf};
 
 /// A file system change store.
 pub struct FileSystem {
-    change_cache: RefCell<lru_cache::LruCache<ChangeId, ChangeFile>>,
+    change_cache: RefCell<lru_cache::LruCache<ChangeId, ChangeFile<'static>>>,
     changes_dir: PathBuf,
 }
 
@@ -79,7 +79,7 @@ impl FileSystem {
         hash: F,
         change: ChangeId,
     ) -> Result<
-        std::cell::RefMut<lru_cache::LruCache<ChangeId, ChangeFile>>,
+        std::cell::RefMut<lru_cache::LruCache<ChangeId, ChangeFile<'static>>>,
         crate::change::ChangeError,
     > {
         let mut change_cache = self.change_cache.borrow_mut();

libpijul/src/changestore/filesystem.rs

@@ -73,22 +73,7 @@ pub use crate::record::{Algorithm, InodeUpdate};
 pub use crate::unrecord::UnrecordError;
 
 // Making hashmaps deterministic (for testing)
-pub struct Xxh64(xxhash_rust::xxh64::Xxh64);
-impl std::hash::Hasher for Xxh64 {
-    fn write(&mut self, bytes: &[u8]) {
-        self.0.write(bytes)
-    }
-    fn finish(&self) -> u64 {
-        self.0.finish()
-    }
-}
-impl Default for Xxh64 {
-    fn default() -> Self {
-        Xxh64(xxhash_rust::xxh64::Xxh64::new(0))
-    }
-}
-
-pub type Hasher = std::hash::BuildHasherDefault<Xxh64>;
+pub type Hasher = std::hash::BuildHasherDefault<twox_hash::XxHash64>;
 pub type HashMap<K, V> = std::collections::HashMap<K, V, Hasher>;
 pub type HashSet<K> = std::collections::HashSet<K, Hasher>;
 // pub type HashMap<K, V> = std::collections::HashMap<K, V, std::collections::hash_map::RandomState>;

libpijul/src/lib.rs

@@ -261,7 +261,7 @@ impl RemoteId {
 
     pub fn from_base32(b: &[u8]) -> Option<Self> {
         let mut bb = RemoteId([0; 16]);
-        if b.len() != bb.0.len() {
+        if b.len() != data_encoding::BASE32_NOPAD.encode_len(16) {
             return None;
         }
         if data_encoding::BASE32_NOPAD.decode_mut(b, &mut bb.0).is_ok() {

libpijul/src/pristine/mod.rs

@@ -1,3 +1,5 @@
+use crate::working_copy::WorkingCopyRead;
+
 use super::*;
 use std::io::Write;
 

libpijul/src/tests/add_file.rs

@@ -153,15 +153,7 @@ fn text() -> Result<(), anyhow::Error> {
 fn text_test<C: ChangeStore>(c: &C, change0: &Change, h: Hash) {
     let mut v = Vec::new();
     // let channel = channel.borrow();
-    change0
-        .write(
-            c,
-            Some(h),
-            |l, _p| format!("{}:{}", l.path, l.line),
-            true,
-            &mut v,
-        )
-        .unwrap();
+    change0.write(c, Some(h), true, &mut v).unwrap();
     for i in std::str::from_utf8(&v).unwrap().lines() {
         debug!("{}", i);
     }

libpijul/src/tests/change.rs

@@ -1,5 +1,5 @@
 use super::*;
-use crate::working_copy::WorkingCopy;
+use crate::working_copy::{WorkingCopy, WorkingCopyRead};
 use std::io::Write;
 
 #[test]