change!: move hashing API to gix_hash

Author: emilazy

Cargo.lock

@@ -24,7 +24,7 @@ progress = ["prodash"]
 ## Provide human-readable numbers as well as easier to read byte units for progress bars.
 progress-unit-human-numbers = ["prodash?/unit-human"]
 ## Provide human readable byte units for progress bars.
-progress-unit-bytes = ["dep:bytesize", "prodash?/unit-bytes", "gix-hash/progress-unit-bytes"]
+progress-unit-bytes = ["dep:bytesize", "prodash?/unit-bytes"]
 
 ## Provide utilities suitable for working with the `std::fs::read_dir()`.
 fs-read-dir = ["dep:gix-utils"]
@@ -107,7 +107,6 @@ path = "tests/pipe.rs"
 required-features = ["io-pipe"]
 
 [dependencies]
-gix-hash = { version = "^0.16.0", path = "../gix-hash" }
 gix-trace = { version = "^0.1.12", path = "../gix-trace" }
 
 # for walkdir

gix-features/Cargo.toml

@@ -1,13 +1,5 @@
 //! Hash functions and hash utilities
 
-// TODO: Remove this.
-#[cfg(any(feature = "rustsha1", feature = "fast-sha1"))]
-pub use gix_hash::hasher::{
-    hasher,
-    io::{bytes, bytes_of_file, bytes_with_hasher, Write},
-    Digest, Hasher,
-};
-
 /// Compute a CRC32 hash from the given `bytes`, returning the CRC32 hash.
 ///
 /// When calling this function for the first time, `previous_value` should be `0`. Otherwise it

gix-features/src/hash.rs

@@ -16,14 +16,11 @@ doctest = false
 test = false
 
 [features]
-# Temporary, to avoid a circular dependency on `gix-features`.
-progress-unit-bytes = ["prodash/unit-bytes"]
 ## Data structures implement `serde::Serialize` and `serde::Deserialize`.
 serde = ["dep:serde"]
 
 [dependencies]
-# Temporary, to avoid a circular dependency on `gix-features`.
-prodash = "29.0.1"
+gix-features = { version = "^0.40.0", path = "../gix-features", features = ["progress"] }
 
 thiserror = "2.0.0"
 faster-hex = { version = "0.9.0" }

gix-hash/Cargo.toml

@@ -1,32 +1,5 @@
 use crate::{hasher, Hasher};
 
-// Temporary, to avoid a circular dependency on `gix-features`.
-///
-mod gix_features {
-    ///
-    pub mod progress {
-        pub use prodash::{self, unit, Progress, Unit};
-
-        ///
-        #[cfg(feature = "progress-unit-bytes")]
-        pub fn bytes() -> Option<Unit> {
-            Some(unit::dynamic_and_mode(
-                unit::Bytes,
-                unit::display::Mode::with_throughput().and_percentage(),
-            ))
-        }
-
-        ///
-        #[cfg(not(feature = "progress-unit-bytes"))]
-        pub fn bytes() -> Option<Unit> {
-            Some(unit::label_and_mode(
-                "B",
-                unit::display::Mode::with_throughput().and_percentage(),
-            ))
-        }
-    }
-}
-
 /// Compute the hash of `kind` for the bytes in the file at `path`, hashing only the first `num_bytes_from_start`
 /// while initializing and calling `progress`.
 ///
@@ -35,8 +8,7 @@ mod gix_features {
 ///
 /// # Note
 ///
-/// * Interrupts are supported.
-// TODO: Fix link to `gix_features::interrupt`.
+/// * [Interrupts][gix_features::interrupt] are supported.
 pub fn bytes_of_file(
     path: &std::path::Path,
     num_bytes_from_start: u64,