maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(tvix/nix-compat): fold NameError into Error

Browse source 
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 <flokli@flokli.de>
Reviewed-by: tazjin <tazjin@tvl.su>
This commit is contained in:
Florian Klink 2023-07-18 20:46:55 +03:00 • committed by clbot
parent 728de762fd
commit 5364fcb127
4 changed files with 27 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tvix/store/src/proto/tests/pathinfo.rs
View file

@ -66,7 +66,7 @@ fn validate_no_node(
},
Err(ValidatePathInfoError::InvalidNodeName(
"invalid".to_string(),
store_path::Error::InvalidName(store_path::NameError::InvalidName("".to_string()))
store_path::Error::InvalidLength()
));
"invalid node name"
)]
@ -111,7 +111,7 @@ fn validate_directory(
},
Err(ValidatePathInfoError::InvalidNodeName(
"invalid".to_string(),
store_path::Error::InvalidName(store_path::NameError::InvalidName("".to_string()))
store_path::Error::InvalidLength()
));
"invalid node name"
)]
@ -141,7 +141,7 @@ fn validate_file(t_file_node: proto::FileNode, t_result: Result<StorePath, Valid
},
Err(ValidatePathInfoError::InvalidNodeName(
"invalid".to_string(),
store_path::Error::InvalidName(store_path::NameError::InvalidName("".to_string()))
store_path::Error::InvalidLength()
));
"invalid node name"
)]