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

refactor(tvix/derivation): don't create deref'd immediately ref

Browse source 
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 <flokli@flokli.de>
Reviewed-by: tazjin <tazjin@tvl.su>
This commit is contained in:
Florian Klink 2023-02-01 11:14:50 +01:00 committed by clbot
parent ce4d87b129
commit 361ffd7903
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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) => {

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

@ -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(),