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

refactor(tvix): turn nullary enum variants into unit variants

Browse source 
Change-Id: Iad4f2cb4aa92b5bb29ead6050348a8cd3e7b8632
Reviewed-on: https://cl.tvl.fyi/c/depot/+/9860
Reviewed-by: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
This commit is contained in:
edef 2023-10-27 12:31:12 +00:00
parent 520c5a191e
commit e525272019
6 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tvix/store/src/proto/mod.rs
View file

@ -29,7 +29,7 @@ pub enum ValidatePathInfoError {
/// No node present
#[error("No node present")]
NoNodePresent(),
NoNodePresent,
/// Node fails validation
#[error("Invalid root node: {:?}", .0.to_string())]
@ -159,7 +159,7 @@ impl PathInfo {
// Ensure there is a (root) node present, and it properly parses to a [store_path::StorePath].
let root_nix_path = match &self.node {
None | Some(castorepb::Node { node: None }) => {
Err(ValidatePathInfoError::NoNodePresent())?
Err(ValidatePathInfoError::NoNodePresent)?
}
Some(castorepb::Node { node: Some(node) }) => {
node.validate()

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

@ -8,12 +8,12 @@ use tvix_castore::proto as castorepb;
#[test_case(
None,
Err(ValidatePathInfoError::NoNodePresent()) ;
Err(ValidatePathInfoError::NoNodePresent) ;
"No node"
)]
#[test_case(
Some(castorepb::Node { node: None }),
Err(ValidatePathInfoError::NoNodePresent());
Err(ValidatePathInfoError::NoNodePresent);
"No node 2"
)]
fn validate_no_node(
@ -54,7 +54,7 @@ fn validate_no_node(
},
Err(ValidatePathInfoError::InvalidNodeName(
"invalid".into(),
store_path::Error::InvalidLength()
store_path::Error::InvalidLength
));
"invalid node name"
)]
@ -99,7 +99,7 @@ fn validate_directory(
},
Err(ValidatePathInfoError::InvalidNodeName(
"invalid".into(),
store_path::Error::InvalidLength()
store_path::Error::InvalidLength
));
"invalid node name"
)]
@ -132,7 +132,7 @@ fn validate_file(
},
Err(ValidatePathInfoError::InvalidNodeName(
"invalid".into(),
store_path::Error::InvalidLength()
store_path::Error::InvalidLength
));
"invalid node name"
)]