From c19c6c23cb2a36279ee147d335ffbe506b0f485b Mon Sep 17 00:00:00 2001 From: edef Date: Fri, 27 Oct 2023 12:07:13 +0000 Subject: feat(nix-compat/store_path): validate_name takes AsRef<[u8]> Change-Id: I8819e2a7b63008a68f4f82035a08b960ac480dc3 Reviewed-on: https://cl.tvl.fyi/c/depot/+/9858 Reviewed-by: flokli Tested-by: BuildkiteCI --- tvix/nix-compat/src/store_path/mod.rs | 4 +++- tvix/nix-compat/src/store_path/utils.rs | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'tvix') diff --git a/tvix/nix-compat/src/store_path/mod.rs b/tvix/nix-compat/src/store_path/mod.rs index 56bf639f2129..8c5f6fd5c222 100644 --- a/tvix/nix-compat/src/store_path/mod.rs +++ b/tvix/nix-compat/src/store_path/mod.rs @@ -177,7 +177,9 @@ impl StorePath { /// Checks a given &[u8] to match the restrictions for [StorePath::name], and /// returns the name as string if successful. -pub(crate) fn validate_name(s: &[u8]) -> Result<&str, Error> { +pub(crate) fn validate_name(s: &(impl AsRef<[u8]> + ?Sized)) -> Result<&str, Error> { + let s = s.as_ref(); + // Empty or excessively long names are not allowed. if s.is_empty() || s.len() > 211 { return Err(Error::InvalidLength()); diff --git a/tvix/nix-compat/src/store_path/utils.rs b/tvix/nix-compat/src/store_path/utils.rs index 94e9f106d9d5..44e4e4a59e94 100644 --- a/tvix/nix-compat/src/store_path/utils.rs +++ b/tvix/nix-compat/src/store_path/utils.rs @@ -166,8 +166,7 @@ fn build_store_path_from_fingerprint_parts>( hash: &NixHash, name: B, ) -> Result { - let name = name.as_ref(); - let name = super::validate_name(name.as_ref())?.to_owned(); + let name = super::validate_name(&name)?.to_owned(); let digest = compress_hash(&{ let mut h = Sha256::new(); -- cgit 1.4.1