From 2d99bfc7b791ede5e385896a684f6d28e035714c Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 21 Oct 2023 18:48:31 +0100 Subject: refactor(tvix/cli): rename `a` to `algo_str` Change-Id: I65d307126647841b50db008c21c155441a6b6cb5 Reviewed-on: https://cl.tvl.fyi/c/depot/+/9818 Reviewed-by: raitobezarius Tested-by: BuildkiteCI --- tvix/cli/src/derivation.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'tvix') diff --git a/tvix/cli/src/derivation.rs b/tvix/cli/src/derivation.rs index 2835c3829a..af787a6f55 100644 --- a/tvix/cli/src/derivation.rs +++ b/tvix/cli/src/derivation.rs @@ -120,13 +120,14 @@ fn populate_output_configuration( None => return Err(Error::ConflictingOutputTypes.into()), Some(out) => { // treat an empty algo as None - let a = if algo.is_empty() { + let algo_str = if algo.is_empty() { None } else { Some(algo.as_ref()) }; - let hash = nixhash::from_str(&nixhash_str, a).map_err(Error::InvalidOutputHash)?; + let hash = + nixhash::from_str(&nixhash_str, algo_str).map_err(Error::InvalidOutputHash)?; // construct the NixHashWithMode. out.ca_hash = match hash_mode.as_deref() { -- cgit 1.4.1