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

refactor(tvix/nix-compat/derivation): fod_digest return [u8; 32]

Browse source 
This is of known length.

Change-Id: Iba48ccc486d5bf9e38ec1a2da6e7b80997d2c6ca
Reviewed-on: https://cl.tvl.fyi/c/depot/+/9723
Autosubmit: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
Reviewed-by: Connor Brewster <cbrewster@hey.com>
This commit is contained in:
Florian Klink 2023-10-14 17:53:02 +01:00 committed by clbot
parent 4ae0f428bd
commit cc040a5ad3
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -115,7 +115,7 @@ impl Derivation {
/// Returns the FOD digest, if the derivation is fixed-output, or None if /// Returns the FOD digest, if the derivation is fixed-output, or None if
/// it's not. /// it's not.
fn fod_digest(&self) -> Option<Vec<u8>> { fn fod_digest(&self) -> Option<[u8; 32]> {
if self.outputs.len() != 1 { if self.outputs.len() != 1 {
return None; return None;
} }
@ -128,7 +128,7 @@ impl Derivation {
out_output.path out_output.path
)) ))
.finalize() .finalize()
.to_vec(), .into(),
) )
} }
@ -184,10 +184,10 @@ impl Derivation {
let mut hasher = Sha256::new(); let mut hasher = Sha256::new();
hasher.update(replaced_derivation.to_aterm_bytes()); hasher.update(replaced_derivation.to_aterm_bytes());
hasher.finalize().to_vec() hasher.finalize().into()
}); });
NixHash::Sha256(digest.try_into().unwrap()) NixHash::Sha256(digest)
} }
/// This calculates all output paths of a Derivation and updates the struct. /// This calculates all output paths of a Derivation and updates the struct.