about summary refs log tree commit diff
path: root/tvix/derivation/src/validate.rs
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2023-01-17T11·04+0100
committerflokli <flokli@flokli.de>2023-01-18T17·13+0000
commit6e7f06d942a5e54d20d4441ff196ce3ffc99855a (patch)
treec20593cc69b5b2fb9cfe815f4119668606c6736f /tvix/derivation/src/validate.rs
parenteebb3ce028e56872cdfee462dd6556e33d2f204e (diff)
refactor(tvix/derivation): use DerivationError in Output::validate r/5696
Change-Id: I7dbd3b8ff9ef92acddde2e579fb24b8311c34d8f
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7852
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
Diffstat (limited to 'tvix/derivation/src/validate.rs')
-rw-r--r--tvix/derivation/src/validate.rs7
1 files changed, 2 insertions, 5 deletions
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