diff options
Diffstat (limited to 'tvix/castore')
-rw-r--r-- | tvix/castore/src/proto/mod.rs | 4 | ||||
-rw-r--r-- | tvix/castore/src/proto/tests/directory.rs | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/tvix/castore/src/proto/mod.rs b/tvix/castore/src/proto/mod.rs index cd7ea66b8ccd..f590c6841336 100644 --- a/tvix/castore/src/proto/mod.rs +++ b/tvix/castore/src/proto/mod.rs @@ -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(()) } diff --git a/tvix/castore/src/proto/tests/directory.rs b/tvix/castore/src/proto/tests/directory.rs index d4de19b77114..0464a268292c 100644 --- a/tvix/castore/src/proto/tests/directory.rs +++ b/tvix/castore/src/proto/tests/directory.rs @@ -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"), |