From 5364fcb12708667a2dc698a689d00d70d1bf75af Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 18 Jul 2023 20:46:55 +0300 Subject: feat(tvix/nix-compat): fold NameError into Error This being a nested error makes things more complicated than necessary. Also, this caused BuildStorePathError to only hold NameError, so refactor these utility functions to either return Error, or BuildStorePathError. Change-Id: I046fb403780cc5135df8b8833a291fc2a90fd913 Reviewed-on: https://cl.tvl.fyi/c/depot/+/8972 Tested-by: BuildkiteCI Autosubmit: flokli Reviewed-by: tazjin --- tvix/nix-compat/src/derivation/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tvix/nix-compat/src/derivation/mod.rs') diff --git a/tvix/nix-compat/src/derivation/mod.rs b/tvix/nix-compat/src/derivation/mod.rs index ab14711655..ab615d502d 100644 --- a/tvix/nix-compat/src/derivation/mod.rs +++ b/tvix/nix-compat/src/derivation/mod.rs @@ -212,7 +212,7 @@ impl Derivation { build_output_path(derivation_or_fod_hash, output_name, &path_name).map_err(|e| { DerivationError::InvalidOutputDerivationPath( output_name.to_string(), - store_path::BuildStorePathError::InvalidName(e), + store_path::BuildStorePathError::InvalidStorePath(e), ) })? }; -- cgit 1.4.1