mdebray/tvl-depot
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/castore/src/proto/mod.rs
View file

@ -48,7 +48,7 @@ pub enum ValidateNodeError {
InvalidDigestLen(usize),
/// Invalid name encountered
#[error("Invalid name")]
InvalidName(),
InvalidName,
/// Invalid symlink target
#[error("Invalid symlink target: {}", .0.as_bstr())]
InvalidSymlinkTarget(Vec<u8>),
@ -63,7 +63,7 @@ fn validate_node_name(name: &[u8]) -> Result<(), ValidateNodeError> {
|| name.contains(&0x00)
|| name.contains(&b'/')
{
Err(ValidateNodeError::InvalidName())?;
Err(ValidateNodeError::InvalidName)?;
}
Ok(())
}

10
tvix/castore/src/proto/tests/directory.rs
View file

@ -165,7 +165,7 @@ fn validate_invalid_names() {
..Default::default()
};
match d.validate().expect_err("must fail") {
ValidateDirectoryError::InvalidNode(n, ValidateNodeError::InvalidName()) => {
ValidateDirectoryError::InvalidNode(n, ValidateNodeError::InvalidName) => {
assert_eq!(n, b"")
}
_ => panic!("unexpected error"),
@ -182,7 +182,7 @@ fn validate_invalid_names() {
..Default::default()
};
match d.validate().expect_err("must fail") {
ValidateDirectoryError::InvalidNode(n, ValidateNodeError::InvalidName()) => {
ValidateDirectoryError::InvalidNode(n, ValidateNodeError::InvalidName) => {
assert_eq!(n, b".")
}
_ => panic!("unexpected error"),
@ -200,7 +200,7 @@ fn validate_invalid_names() {
..Default::default()
};
match d.validate().expect_err("must fail") {
ValidateDirectoryError::InvalidNode(n, ValidateNodeError::InvalidName()) => {
ValidateDirectoryError::InvalidNode(n, ValidateNodeError::InvalidName) => {
assert_eq!(n, b"..")
}
_ => panic!("unexpected error"),
@ -216,7 +216,7 @@ fn validate_invalid_names() {
..Default::default()
};
match d.validate().expect_err("must fail") {
ValidateDirectoryError::InvalidNode(n, ValidateNodeError::InvalidName()) => {
ValidateDirectoryError::InvalidNode(n, ValidateNodeError::InvalidName) => {
assert_eq!(n, b"\x00")
}
_ => panic!("unexpected error"),
@ -232,7 +232,7 @@ fn validate_invalid_names() {
..Default::default()
};
match d.validate().expect_err("must fail") {
ValidateDirectoryError::InvalidNode(n, ValidateNodeError::InvalidName()) => {
ValidateDirectoryError::InvalidNode(n, ValidateNodeError::InvalidName) => {
assert_eq!(n, b"foo/bar")
}
_ => panic!("unexpected error"),