From 6e7f06d942a5e54d20d4441ff196ce3ffc99855a Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 17 Jan 2023 12:04:15 +0100 Subject: refactor(tvix/derivation): use DerivationError in Output::validate Change-Id: I7dbd3b8ff9ef92acddde2e579fb24b8311c34d8f Reviewed-on: https://cl.tvl.fyi/c/depot/+/7852 Tested-by: BuildkiteCI Reviewed-by: tazjin --- tvix/derivation/src/validate.rs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'tvix/derivation/src/validate.rs') diff --git a/tvix/derivation/src/validate.rs b/tvix/derivation/src/validate.rs index 65809ef5e5f3..a2143509011b 100644 --- a/tvix/derivation/src/validate.rs +++ b/tvix/derivation/src/validate.rs @@ -39,11 +39,8 @@ impl Derivation { } if let Err(e) = output.validate() { - return Err(DerivationError::InvalidOutputPath( - output_name.to_string(), - e, - )); - }; + return Err(DerivationError::InvalidOutput(output_name.to_string(), e)); + } } // Validate all input_derivations -- cgit 1.4.1