From 361ffd7903ab129657a7dcc37654f3c077321027 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 1 Feb 2023 11:14:50 +0100 Subject: [PATCH] refactor(tvix/derivation): don't create deref'd immediately ref clippy says: > This expression creates a reference which is immediately dereferenced > by the compiler Change-Id: Ic2c093b043ebee9ae80912075083107e4d216cf1 Reviewed-on: https://cl.tvl.fyi/c/depot/+/7995 Tested-by: BuildkiteCI Autosubmit: flokli Reviewed-by: tazjin --- tvix/nix-compat/src/derivation/output.rs | 2 +- tvix/nix-compat/src/derivation/validate.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tvix/nix-compat/src/derivation/output.rs b/tvix/nix-compat/src/derivation/output.rs index 9aef7172a..39c0dbde5 100644 --- a/tvix/nix-compat/src/derivation/output.rs +++ b/tvix/nix-compat/src/derivation/output.rs @@ -26,7 +26,7 @@ impl Output { pub fn validate(&self, validate_output_paths: bool) -> Result<(), OutputError> { if let Some(hash) = &self.hash { // try to decode digest - let result = nixbase32::decode(&hash.digest.as_bytes()); + let result = nixbase32::decode(hash.digest.as_bytes()); match result { Err(e) => return Err(OutputError::InvalidHashEncoding(hash.digest.clone(), e)), Ok(digest) => { diff --git a/tvix/nix-compat/src/derivation/validate.rs b/tvix/nix-compat/src/derivation/validate.rs index 91b24f811..d8dc24a92 100644 --- a/tvix/nix-compat/src/derivation/validate.rs +++ b/tvix/nix-compat/src/derivation/validate.rs @@ -29,7 +29,7 @@ impl Derivation { // [StorePath] will fail the [StorePath::validate_name] check. if output_name.is_empty() || output_name == "drv" - || StorePath::validate_name(&output_name).is_err() + || StorePath::validate_name(output_name).is_err() { return Err(DerivationError::InvalidOutputName(output_name.to_string())); } @@ -86,7 +86,7 @@ impl Derivation { // [StorePath] will fail the [StorePath::validate_name] check. if output_name.is_empty() || output_name == "drv" - || StorePath::validate_name(&output_name).is_err() + || StorePath::validate_name(output_name).is_err() { return Err(DerivationError::InvalidInputDerivationOutputName( input_derivation_path.to_string(),