diff options
author | Florian Klink <flokli@flokli.de> | 2024-03-14T12·22+0200 |
---|---|---|
committer | clbot <clbot@tvl.fyi> | 2024-03-14T23·10+0000 |
commit | 142c72e070e32710cb691c0c3b79babad595cb62 (patch) | |
tree | 450df0f98494817ab13ae1c049e07d8a625a30a9 /tvix/nix-compat/src/store_path/mod.rs | |
parent | 98e6936301dadc3400cb361a787cac8215c7bab8 (diff) |
refactor(nix-compat/store_path): add from_name_and_digest_fixed r/7693
Allow constructing a StorePath with a fixed-size digest. Change-Id: Id7d0b0152f6c55660a8973a02c84afa9188ce3ba Reviewed-on: https://cl.tvl.fyi/c/depot/+/11144 Autosubmit: flokli <flokli@flokli.de> Reviewed-by: John Ericson <git@johnericson.me> Tested-by: BuildkiteCI
Diffstat (limited to 'tvix/nix-compat/src/store_path/mod.rs')
-rw-r--r-- | tvix/nix-compat/src/store_path/mod.rs | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/tvix/nix-compat/src/store_path/mod.rs b/tvix/nix-compat/src/store_path/mod.rs index c744f1a46afe..3638ce6e87df 100644 --- a/tvix/nix-compat/src/store_path/mod.rs +++ b/tvix/nix-compat/src/store_path/mod.rs @@ -215,10 +215,21 @@ impl<'a> StorePathRef<'a> { } /// Construct a [StorePathRef] from a name and digest. + /// The name is validated, and the digest checked for size. pub fn from_name_and_digest(name: &'a str, digest: &[u8]) -> Result<Self, Error> { + let digest_fixed = digest.try_into().map_err(|_| Error::InvalidLength)?; + Self::from_name_and_digest_fixed(name, digest_fixed) + } + + /// Construct a [StorePathRef] from a name and digest of correct length. + /// The name is validated. + pub fn from_name_and_digest_fixed( + name: &'a str, + digest: [u8; DIGEST_SIZE], + ) -> Result<Self, Error> { Ok(Self { name: validate_name(name.as_bytes())?, - digest: digest.try_into().map_err(|_| Error::InvalidLength)?, + digest, }) } |