mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(tvix/nix-compat): rename NixHash::{digest,hash}

Browse source 
This doesn't return the digest, but the internal NixHash.

To get the digest, you use `ca_hash.hash().digest_as_bytes()`
(as done in tvix/nix-compat/src/derivation/write.rs).

Change-Id: Ib07918dec63ae42ddf8c8d3f1d10510f9c4df255
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11070
Reviewed-by: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
Autosubmit: flokli <flokli@flokli.de>
This commit is contained in:
Florian Klink 2024-02-29 10:31:14 +02:00 committed by clbot
parent 7bebf492ec
commit 260c2938d4
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tvix/nix-compat/src/derivation/mod.rs
View file

@ -160,7 +160,7 @@ impl Derivation {
Sha256::new_with_prefix(format!( Sha256::new_with_prefix(format!(
"fixed:out:{}{}:{}", "fixed:out:{}{}:{}",
ca_kind_prefix(ca_hash), ca_kind_prefix(ca_hash),
ca_hash.digest().to_nix_hex_string(), ca_hash.hash().to_nix_hex_string(),
out_output out_output
.path .path
.as_ref() .as_ref()

4
tvix/nix-compat/src/derivation/write.rs
View file

@ -137,8 +137,8 @@ pub(crate) fn write_outputs(
let (mode_and_algo, digest) = match &output.ca_hash { let (mode_and_algo, digest) = match &output.ca_hash {
Some(ca_hash) => ( Some(ca_hash) => (
format!("{}{}", ca_kind_prefix(ca_hash), ca_hash.digest().algo()), format!("{}{}", ca_kind_prefix(ca_hash), ca_hash.hash().algo()),
data_encoding::HEXLOWER.encode(ca_hash.digest().digest_as_bytes()), data_encoding::HEXLOWER.encode(ca_hash.hash().digest_as_bytes()),
), ),
None => ("".to_string(), "".to_string()), None => ("".to_string(), "".to_string()),
}; };

2
tvix/nix-compat/src/nixhash/ca_hash.rs
View file

@ -23,7 +23,7 @@ pub enum CAHash {
} }
impl CAHash { impl CAHash {
pub fn digest(&self) -> Cow<NixHash> { pub fn hash(&self) -> Cow<NixHash> {
match *self { match *self {
CAHash::Flat(ref digest) => Cow::Borrowed(digest), CAHash::Flat(ref digest) => Cow::Borrowed(digest),
CAHash::Nar(ref digest) => Cow::Borrowed(digest), CAHash::Nar(ref digest) => Cow::Borrowed(digest),