Cleanup sha1 feature in gix to just set what's needed.

codex · Byron · Byron · commit 16a6fc44cf33 · 2026-05-07T13:08:09.000+08:00
These features must only be set if the crate is actually using it with
`cfg!(feature = "shaX")`, and only two crates do that right now.

It's needed also when compilation would fail if no hash feature is selected.

Co-authored-by: Sebastian Thiel &lt;sebastian.thiel@icloud.com&gt;
diff --git a/Cargo.toml b/Cargo.toml
@@ -92,9 +92,11 @@ lean-async = ["hashes", "fast", "tracing", "pretty-cli", "gitoxide-core-tools",
 #! Typical combinations of features of our dependencies, some of which are referred to in the `gitoxide` crate's code for conditional compilation.
 
 ## Provide support for all known hashes. If this isn't enabled, select an individual hash algorithms.
-hashes = ["sha1"]
+hashes = ["sha1", "sha256"]
 ## Enable support for the SHA-1 hash throughout the `gix` crate.
 sha1 = ["gix/sha1"]
+## Enable support for the SHA-256 hash throughout the `gix` crate.
+sha256 = ["gix/sha256"]
 
 ## Makes the crate execute as fast as possible by supporting parallel computation of otherwise long-running functions.
 ## If disabled, the binary will be visibly smaller.
diff --git a/gix-archive/Cargo.toml b/gix-archive/Cargo.toml
@@ -17,7 +17,7 @@ doctest = false
 [features]
 default = ["tar", "tar_gz", "zip"]
 ## Enable support for the SHA-1 hash by forwarding the feature to dependencies.
-sha1 = ["gix-worktree-stream/sha1", "gix-object/sha1"]
+sha1 = ["gix-worktree-stream/sha1"]
 ## Enable support for the SHA-256 hash by forwarding the feature to dependencies.
 sha256 = ["gix-worktree-stream/sha256"]
 
diff --git a/gix-blame/Cargo.toml b/gix-blame/Cargo.toml
@@ -13,15 +13,7 @@ include = ["/src/**/*", "/LICENSE-*"]
 
 [features]
 ## Enable support for the SHA-1 hash by forwarding the feature to dependencies.
-sha1 = [
-    "gix-commitgraph/sha1",
-    "gix-diff/sha1",
-    "gix-hash/sha1",
-    "gix-object/sha1",
-    "gix-revwalk/sha1",
-    "gix-traverse/sha1",
-    "gix-worktree/sha1",
-]
+sha1 = ["gix-hash/sha1"]
 ## Enable support for the SHA-256 hash by forwarding the feature to dependencies.
 sha256 = ["gix-hash/sha256"]
 
diff --git a/gix-config/Cargo.toml b/gix-config/Cargo.toml
@@ -17,6 +17,8 @@ autotests = false
 [features]
 ## Enable support for the SHA-1 hash by forwarding the feature to dependencies.
 sha1 = ["gix-ref/sha1"]
+## Enable support for the SHA-256 hash by forwarding the feature to dependencies.
+sha256 = ["gix-ref/sha256"]
 ## Data structures implement `serde::Serialize` and `serde::Deserialize`.
 serde = ["dep:serde", "bstr/serde", "gix-sec/serde", "gix-ref/serde", "gix-glob/serde", "gix-config-value/serde"]
 
diff --git a/gix-dir/Cargo.toml b/gix-dir/Cargo.toml
@@ -17,7 +17,9 @@ test = false
 
 [features]
 ## Enable support for the SHA-1 hash by forwarding the feature to dependencies.
-sha1 = ["gix-discover/sha1", "gix-index/sha1", "gix-object/sha1", "gix-worktree/sha1"]
+sha1 = ["gix-index/sha1"]
+## Enable support for the SHA-256 hash by forwarding the feature to dependencies.
+sha256 = ["gix-index/sha256"]
 
 [dependencies]
 gix-trace = { version = "^0.1.19", path = "../gix-trace" }
diff --git a/gix-discover/Cargo.toml b/gix-discover/Cargo.toml
@@ -17,6 +17,8 @@ doctest = true
 [features]
 ## Enable support for the SHA-1 hash by forwarding the feature to dependencies.
 sha1 = ["gix-ref/sha1"]
+## Enable support for the SHA-256 hash by forwarding the feature to dependencies.
+sha256 = ["gix-ref/sha256"]
 
 [dependencies]
 gix-sec = { version = "^0.14.0", path = "../gix-sec" }
diff --git a/gix-filter/Cargo.toml b/gix-filter/Cargo.toml
@@ -16,7 +16,7 @@ doctest = false
 
 [features]
 ## Enable support for the SHA-1 hash by forwarding the feature to dependencies.
-sha1 = ["gix-hash/sha1", "gix-object/sha1"]
+sha1 = ["gix-hash/sha1"]
 ## Enable support for the SHA-256 hash by forwarding the feature to dependencies.
 sha256 = ["gix-hash/sha256"]
 
diff --git a/gix-fsck/Cargo.toml b/gix-fsck/Cargo.toml
@@ -16,7 +16,7 @@ doctest = false
 
 [features]
 ## Enable support for the SHA-1 hash by forwarding the feature to dependencies.
-sha1 = ["gix-hash/sha1", "gix-hashtable/sha1", "gix-object/sha1"]
+sha1 = ["gix-hash/sha1"]
 ## Enable support for the SHA-256 hash by forwarding the feature to dependencies.
 sha256 = ["gix-hash/sha256"]
 
diff --git a/gix-negotiate/Cargo.toml b/gix-negotiate/Cargo.toml
@@ -17,7 +17,7 @@ test = false
 
 [features]
 ## Enable support for the SHA-1 hash by forwarding the feature to dependencies.
-sha1 = ["gix-commitgraph/sha1", "gix-hash/sha1", "gix-object/sha1", "gix-revwalk/sha1"]
+sha1 = ["gix-hash/sha1"]
 ## Enable support for the SHA-256 hash by forwarding the feature to dependencies.
 sha256 = ["gix-hash/sha256"]
 
diff --git a/gix-revwalk/Cargo.toml b/gix-revwalk/Cargo.toml
@@ -16,7 +16,7 @@ doctest = false
 
 [features]
 ## Enable support for the SHA-1 hash by forwarding the feature to dependencies.
-sha1 = ["gix-commitgraph/sha1", "gix-hash/sha1", "gix-hashtable/sha1", "gix-object/sha1"]
+sha1 = ["gix-hash/sha1"]
 ## Enable support for the SHA-256 hash by forwarding the feature to dependencies.
 sha256 = ["gix-hash/sha256"]
 
diff --git a/gix-submodule/Cargo.toml b/gix-submodule/Cargo.toml
@@ -16,7 +16,9 @@ doctest = false
 
 [features]
 ## Enable support for the SHA-1 hash by forwarding the feature to dependencies.
-sha1 = ["gix-config/sha1", "gix-refspec/sha1"]
+sha1 = ["gix-refspec/sha1"]
+## Enable support for the SHA-256 hash by forwarding the feature to dependencies.
+sha256 = ["gix-refspec/sha256"]
 
 [dependencies]
 gix-pathspec = { version = "^0.18.0", path = "../gix-pathspec" }
diff --git a/gix-worktree-state/Cargo.toml b/gix-worktree-state/Cargo.toml
@@ -17,7 +17,9 @@ doctest = false
 
 [features]
 ## Enable support for the SHA-1 hash by forwarding the feature to dependencies.
-sha1 = ["gix-filter/sha1", "gix-index/sha1", "gix-object/sha1", "gix-worktree/sha1"]
+sha1 = ["gix-index/sha1"]
+## Enable support for the SHA-256 hash by forwarding the feature to dependencies.
+sha256 = ["gix-index/sha256"]
 
 [dependencies]
 gix-worktree = { version = "^0.52.0", path = "../gix-worktree", default-features = false, features = ["attributes"] }
diff --git a/gix-worktree-stream/Cargo.toml b/gix-worktree-stream/Cargo.toml
@@ -16,7 +16,7 @@ doctest = false
 
 [features]
 ## Enable support for the SHA-1 hash by forwarding the feature to dependencies.
-sha1 = ["gix-filter/sha1", "gix-hash/sha1", "gix-object/sha1", "gix-traverse/sha1"]
+sha1 = ["gix-hash/sha1"]
 ## Enable support for the SHA-256 hash by forwarding the feature to dependencies.
 sha256 = ["gix-hash/sha256"]
 
diff --git a/gix-worktree-stream/src/protocol.rs b/gix-worktree-stream/src/protocol.rs
@@ -90,6 +90,7 @@ pub(crate) fn write_stream(
 
 fn byte_to_hash(b: u8) -> gix_hash::Kind {
     match b {
+        #[cfg(feature = "sha1")]
         0 => gix_hash::Kind::Sha1,
         #[cfg(feature = "sha256")]
         1 => gix_hash::Kind::Sha256,
@@ -112,6 +113,7 @@ fn byte_to_mode(b: u8) -> gix_object::tree::EntryMode {
 
 fn hash_to_byte(h: gix_hash::Kind) -> u8 {
     match h {
+        #[cfg(feature = "sha1")]
         gix_hash::Kind::Sha1 => 0,
         #[cfg(feature = "sha256")]
         gix_hash::Kind::Sha256 => 1,
diff --git a/gix/Cargo.toml b/gix/Cargo.toml
@@ -91,38 +91,13 @@ comfort = [
 ## Enable support for the SHA-1 hash throughout the `gix` stack.
 sha1 = [
     "gix-hash/sha1",
-    "gix-archive?/sha1",
-    "gix-blame?/sha1",
-    "gix-commitgraph/sha1",
-    "gix-config/sha1",
-    "gix-diff/sha1",
-    "gix-dir?/sha1",
-    "gix-discover/sha1",
-    "gix-filter?/sha1",
-    "gix-hashtable/sha1",
-    "gix-index?/sha1",
-    "gix-merge?/sha1",
-    "gix-negotiate?/sha1",
-    "gix-object/sha1",
-    "gix-odb/sha1",
-    "gix-pack/sha1",
-    "gix-protocol/sha1",
-    "gix-ref/sha1",
-    "gix-refspec/sha1",
-    "gix-revision/sha1",
-    "gix-revwalk/sha1",
-    "gix-shallow/sha1",
-    "gix-status?/sha1",
-    "gix-submodule?/sha1",
-    "gix-traverse/sha1",
-    "gix-worktree?/sha1",
-    "gix-worktree-state?/sha1",
     "gix-worktree-stream?/sha1",
 ]
 
 ## Enable support for the SHA-256 hash throughout the `gix` stack.
 sha256 = [
     "gix-hash/sha256",
+    "gix-worktree-stream?/sha256",
 ]
 
 #! #### Components
diff --git a/justfile b/justfile
@@ -90,6 +90,7 @@ check:
     cargo check -p gix-worktree-state --features sha1
     cargo check -p gix-worktree-stream 2>&1 >/dev/null | grep 'Please set either the `sha1` or the `sha256` feature flag'
     cargo check -p gix-worktree-stream --features sha1
+    cargo check -p gix-worktree-stream --features sha256
     cargo check -p gix-actor --features serde
     cargo check -p gix-date --features serde
     cargo check -p gix-dir 2>&1 >/dev/null | grep 'Please set either the `sha1` or the `sha256` feature flag'
