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/output.rs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'tvix/derivation/src/output.rs') diff --git a/tvix/derivation/src/output.rs b/tvix/derivation/src/output.rs index b8bd49fbbb..982ac7c9eb 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(()) } -- cgit 1.4.1