Update pijul

fossdd · fossdd · commit 8889a01608ed · 2021-09-16T00:26:12.000Z
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/libpijul/Cargo.toml b/libpijul/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "libpijul"
 description = "Core library of Pijul, a distributed version control system based on a sound theory of collaborative work."
-version = "1.0.0-alpha.47"
+version = "1.0.0-alpha.48"
 
 repository = "https://nest.pijul.com/pijul/libpijul"
 documentation = "https://docs.rs/libpijul"
@@ -116,7 +116,7 @@ twox-hash = "1.6"
 crossbeam-deque = "0.8"
 crossbeam-utils = "0.8"
 
-zstd-seekable = { version = "0.1.7", optional = true }
+zstd-seekable = { version = "0.2.0", optional = true }
 cfg-if = "1.0"
 memchr = "2.4"
 
diff --git a/libpijul/src/change/change_file.rs b/libpijul/src/change/change_file.rs
@@ -2,8 +2,8 @@ use super::*;
 
 /// An open, seekable change file.
 #[cfg(feature = "zstd")]
-pub struct ChangeFile<'a> {
-    s: Option<zstd_seekable::Seekable<'a, OffFile>>,
+pub struct ChangeFile {
+    s: Option<zstd_seekable::Seekable<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<'a> ChangeFile<'a> {
+impl ChangeFile {
     /// Open a change file from a path.
     pub fn open(hash: Hash, path: &str) -> Result<Self, ChangeError> {
         use std::io::Read;
@@ -84,10 +84,10 @@ impl<'a> ChangeFile<'a> {
         let s = if offsets.contents_off >= m.len() {
             None
         } else {
-            Some(zstd_seekable::Seekable::init(Box::new(OffFile {
+            Some(zstd_seekable::Seekable::init(OffFile {
                 f: r,
                 start: offsets.contents_off,
-            }))?)
+            }, None)?)
         };
         Ok(ChangeFile {
             s,
diff --git a/libpijul/src/changestore/filesystem.rs b/libpijul/src/changestore/filesystem.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<'static>>>,
+    change_cache: RefCell<lru_cache::LruCache<ChangeId, ChangeFile>>,
     changes_dir: PathBuf,
 }
 
@@ -79,7 +79,7 @@ impl FileSystem {
         hash: F,
         change: ChangeId,
     ) -> Result<
-        std::cell::RefMut<lru_cache::LruCache<ChangeId, ChangeFile<'static>>>,
+        std::cell::RefMut<lru_cache::LruCache<ChangeId, ChangeFile>>,
         crate::change::ChangeError,
     > {
         let mut change_cache = self.change_cache.borrow_mut();
diff --git a/pijul/Cargo.toml b/pijul/Cargo.toml
@@ -90,6 +90,7 @@ fs2 = "0.4"
 path-slash = "0.1"
 bytes = "1.0"
 rlimit = "0.6"
+thiserror = "1.0"
 
 [target.'cfg(unix)'.dependencies]
 pager = "0.16.0"
diff --git a/pijul/src/commands/log.rs b/pijul/src/commands/log.rs
