From 645d4c6861a490d76877a6b5a268db963c5569d6 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Fri, 8 Sep 2023 21:03:10 +0200 Subject: [PATCH] update `gix` to the latest version Please note that I have removed the `max-performance-safe` feature which pushes the choice to the consumer of (any) library that uses `gix`. It's also causing less C to be compiled by default. --- Cargo.toml | 5 +---- src/index/git_remote.rs | 6 +++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 332777d..b836c34 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -59,13 +59,10 @@ twox-hash = { version = "1.6", default-features = false } [dependencies.gix] optional = true -version = "0.52" +version = "0.53.1" default-features = false features = [ - "max-performance-safe", - "blocking-network-client", "blocking-http-transport-reqwest", - "reqwest-for-configuration-only", ] [dependencies.reqwest] diff --git a/src/index/git_remote.rs b/src/index/git_remote.rs index d838ff3..cef10e1 100644 --- a/src/index/git_remote.rs +++ b/src/index/git_remote.rs @@ -63,7 +63,7 @@ impl RemoteGitIndex { lock_policy: gix::lock::acquire::Fail, ) -> Result where - P: gix::Progress, + P: gix::NestedProgress, P::SubProgress: 'static, { let open_or_clone_repo = || -> Result<_, GitError> { @@ -339,7 +339,7 @@ impl RemoteGitIndex { should_interrupt: &AtomicBool, ) -> Result<(), Error> where - P: gix::Progress, + P: gix::NestedProgress, P::SubProgress: 'static, { // We're updating the reflog which requires a committer be set, which might @@ -416,7 +416,7 @@ pub enum GitError { #[error(transparent)] ReferenceLookup(#[from] Box), #[error(transparent)] - BlobLookup(#[from] Box>), + BlobLookup(#[from] Box), #[error(transparent)] RemoteLookup(#[from] Box), #[error(transparent)]