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>

1 files changed, 6 insertions, 3 deletions

diff --git a/tvix/derivation/src/output.rs b/tvix/derivation/src/output.rs
index b8bd49fbbb18..982ac7c9eb79 100644
--- a/tvix/derivation/src/output.rs
+++ b/tvix/derivation/src/output.rs
@@ -1,5 +1,7 @@
 use serde::{Deserialize, Serialize};
-use tvix_store::store_path::{ParseStorePathError, StorePath};
+use tvix_store::store_path::StorePath;
+
+use crate::OutputError;
 
 #[derive(Clone, Debug, Default, Eq, PartialEq, Serialize, Deserialize)]
 pub struct Output {
@@ -22,9 +24,10 @@ impl Output {
         self.hash.is_some()
     }
 
-    pub fn validate(&self) -> Result<(), ParseStorePathError> {
+    pub fn validate(&self) -> Result<(), OutputError> {
+        // TODO: add validation for hash, hashAlgo
         if let Err(e) = StorePath::from_absolute_path(&self.path) {
-            return Err(e);
+            return Err(OutputError::InvalidOutputPath(self.path.to_string(), e));
         }
         Ok(())
     }