maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(tvix/nix-compat): clippy

Browse source 
Change-Id: Ie5277a5c15d9dfe543ca41fa7c6a1eedf22a9f64
Reviewed-on: https://cl.tvl.fyi/c/depot/+/8593
Reviewed-by: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
This commit is contained in:
Florian Klink 2023-05-18 21:49:30 +03:00 • committed by flokli
parent 64ee21ec86
commit dcbcac8955
2 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -209,14 +209,12 @@ impl Derivation {
|e| DerivationError::InvalidOutputDerivationPath(output_name.to_string(), e), |e| DerivationError::InvalidOutputDerivationPath(output_name.to_string(), e),
)? )?
} else { } else {
build_output_path(derivation_or_fod_hash, &output_name, &path_name).map_err( build_output_path(derivation_or_fod_hash, output_name, &path_name).map_err(|e| {
|e| {
DerivationError::InvalidOutputDerivationPath( DerivationError::InvalidOutputDerivationPath(
output_name.to_string(), output_name.to_string(),
store_path::BuildStorePathError::InvalidName(e), store_path::BuildStorePathError::InvalidName(e),
) )
}, })?
)?
}; };
output.path = abs_store_path.to_absolute_path(); output.path = abs_store_path.to_absolute_path();

4
tvix/nix-compat/src/store_path/utils.rs
View file

@ -122,7 +122,7 @@ pub fn build_output_path(
build_store_path_from_fingerprint_parts( build_store_path_from_fingerprint_parts(
&(String::from("output:") + output_name), &(String::from("output:") + output_name),
drv_hash, drv_hash,
&output_path_name, output_path_name,
) )
} }
@ -142,7 +142,7 @@ fn build_store_path_from_fingerprint_parts(
let fingerprint = let fingerprint =
String::from(ty) + ":" + &hash.to_nix_hash_string() + ":" + STORE_DIR + ":" + name; String::from(ty) + ":" + &hash.to_nix_hash_string() + ":" + STORE_DIR + ":" + name;
let digest = { let digest = {
let hasher = Sha256::new_with_prefix(&fingerprint); let hasher = Sha256::new_with_prefix(fingerprint);
hasher.finalize() hasher.finalize()
}; };
let compressed = compress_hash::<20>(&digest); let compressed = compress_hash::<20>(&digest);