feat!: use prodash::Count to indicate that nothing more than counting is performed, in place of prodash::Progress

Author: Byron

gix-pack/src/data/file/verify.rs

@@ -1,6 +1,5 @@
-use std::sync::atomic::AtomicBool;
-
 use gix_features::progress::Progress;
+use std::sync::atomic::AtomicBool;
 
 use crate::data::File;
 

gix-pack/src/data/output/count/objects/mod.rs

@@ -111,7 +111,7 @@ where
 pub fn objects_unthreaded<Find, IterErr, Oid>(
     db: Find,
     object_ids: impl Iterator<Item = std::result::Result<Oid, IterErr>>,
-    mut progress: impl Progress,
+    mut progress: impl gix_features::progress::Count,
     should_interrupt: &AtomicBool,
     input_object_expansion: ObjectExpansion,
 ) -> Result<find::existing::Error<Find::Error>, IterErr>
@@ -139,7 +139,6 @@ where
 mod expand {
     use std::sync::atomic::{AtomicBool, Ordering};
 
-    use gix_features::progress::Progress;
     use gix_hash::{oid, ObjectId};
     use gix_object::{CommitRefIter, TagRefIter};
 
@@ -161,7 +160,7 @@ mod expand {
         oids: impl IntoIterator<Item = std::result::Result<Oid, IterErr>>,
         buf1: &mut Vec<u8>,
         #[allow(clippy::ptr_arg)] buf2: &mut Vec<u8>,
-        progress: &mut impl Progress,
+        progress: &mut impl gix_features::progress::Count,
         should_interrupt: &AtomicBool,
         allow_pack_lookups: bool,
     ) -> super::Result<find::existing::Error<Find::Error>, IterErr>
@@ -368,7 +367,7 @@ mod expand {
         all_seen: &impl util::InsertImmutable,
         id: &oid,
         location: Option<crate::data::entry::Location>,
-        progress: &mut impl Progress,
+        progress: &mut impl gix_features::progress::Count,
         statistics: &mut Outcome,
         count_expanded: bool,
     ) {
@@ -388,7 +387,7 @@ mod expand {
         db: &Find,
         buf: &mut Vec<u8>,
         id: &oid,
-        progress: &mut impl Progress,
+        progress: &mut impl gix_features::progress::Count,
         statistics: &mut Outcome,
         allow_pack_lookups: bool,
     ) -> output::Count {

gix-protocol/tests/fetch/mod.rs

@@ -152,7 +152,6 @@ impl fetch::DelegateBlocking for LsRemoteDelegate {
 mod blocking_io {
     use std::io;
 
-    use gix_features::progress::Progress;
     use gix_protocol::{fetch, fetch::Response, handshake, handshake::Ref};
 
     use crate::fetch::{CloneDelegate, CloneRefInWantDelegate, LsRemoteDelegate};
@@ -161,7 +160,7 @@ mod blocking_io {
         fn receive_pack(
             &mut self,
             mut input: impl io::BufRead,
-            _progress: impl Progress,
+            _progress: impl gix_features::progress::Count,
             _refs: &[Ref],
             _previous_response: &Response,
         ) -> io::Result<()> {
@@ -174,7 +173,7 @@ mod blocking_io {
         fn receive_pack(
             &mut self,
             mut input: impl io::BufRead,
-            _progress: impl Progress,
+            _progress: impl gix_features::progress::Count,
             _refs: &[Ref],
             response: &Response,
         ) -> io::Result<()> {
@@ -193,7 +192,7 @@ mod blocking_io {
         fn receive_pack(
             &mut self,
             _input: impl io::BufRead,
-            _progress: impl Progress,
+            _progress: impl gix_features::progress::Count,
             _refs: &[Ref],
             _previous_response: &Response,
         ) -> io::Result<()> {
@@ -208,7 +207,7 @@ mod async_io {
 
     use async_trait::async_trait;
     use futures_io::AsyncBufRead;
-    use gix_features::progress::Progress;
+    use gix_features::progress::NestedProgress;
     use gix_protocol::{fetch, fetch::Response, handshake, handshake::Ref};
 
     use crate::fetch::{CloneDelegate, CloneRefInWantDelegate, LsRemoteDelegate};
@@ -218,7 +217,7 @@ mod async_io {
         async fn receive_pack(
             &mut self,
             mut input: impl AsyncBufRead + Unpin + 'async_trait,
-            _progress: impl Progress,
+            _progress: impl NestedProgress,
             _refs: &[Ref],
             _previous_response: &Response,
         ) -> io::Result<()> {
@@ -232,7 +231,7 @@ mod async_io {
         async fn receive_pack(
             &mut self,
             mut input: impl AsyncBufRead + Unpin + 'async_trait,
-            _progress: impl Progress,
+            _progress: impl NestedProgress,
             _refs: &[Ref],
             response: &Response,
         ) -> io::Result<()> {
@@ -252,7 +251,7 @@ mod async_io {
         async fn receive_pack(
             &mut self,
             _input: impl AsyncBufRead + Unpin + 'async_trait,
-            _progress: impl Progress,
+            _progress: impl NestedProgress,
             _refs: &[Ref],
             _previous_response: &Response,
         ) -> io::Result<()> {

gix-worktree-state/src/checkout/function.rs

@@ -1,6 +1,6 @@
 use std::sync::atomic::AtomicBool;
 
-use gix_features::{interrupt, parallel::in_parallel_with_finalize, progress::Progress};
+use gix_features::{interrupt, parallel::in_parallel_with_finalize};
 use gix_hash::oid;
 use gix_worktree::{stack, Stack};
 
@@ -21,8 +21,8 @@ pub fn checkout<Find, E>(
     index: &mut gix_index::State,
     dir: impl Into<std::path::PathBuf>,
     find: Find,
-    files: &mut impl Progress,
-    bytes: &mut impl Progress,
+    files: &mut impl gix_features::progress::Count,
+    bytes: &mut impl gix_features::progress::Count,
     should_interrupt: &AtomicBool,
     options: crate::checkout::Options,
 ) -> Result<crate::checkout::Outcome, crate::checkout::Error<E>>
@@ -42,8 +42,8 @@ fn checkout_inner<Find, E>(
     paths: &gix_index::PathStorage,
     dir: impl Into<std::path::PathBuf>,
     find: Find,
-    files: &mut impl Progress,
-    bytes: &mut impl Progress,
+    files: &mut impl gix_features::progress::Count,
+    bytes: &mut impl gix_features::progress::Count,
     should_interrupt: &AtomicBool,
     mut options: crate::checkout::Options,
 ) -> Result<crate::checkout::Outcome, crate::checkout::Error<E>>

gix/src/repository/worktree.rs

@@ -114,7 +114,7 @@ impl crate::Repository {
         &self,
         mut stream: gix_worktree_stream::Stream,
         out: impl std::io::Write + std::io::Seek,
-        blobs: impl gix_features::progress::Progress,
+        blobs: impl gix_features::progress::Count,
         should_interrupt: &std::sync::atomic::AtomicBool,
         options: gix_archive::Options,
     ) -> Result<(), crate::repository::worktree_archive::Error> {