diff options
| author | Florian Klink <flokli@flokli.de> | 2024-08-16T14·32+0300 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2024-08-17T15·59+0000 |
| commit | 5ec93b57e6a263eef91ee583aba9f04581e4a66b (patch) | |
| tree | 896407c00900d630a38ee82176ff12e0870f7a20 /tvix/castore/src/fixtures.rs | |
| parent | 8ea7d2b60eb4052d934820078c31ff25786376a4 (diff) | |
refactor(tvix/castore): add PathComponent type for checked components r/8506
This encodes a verified component on the type level. Internally, it contains a bytes::Bytes. The castore Path/PathBuf component() and file_name() methods now return this type, the old ones returning bytes were renamed to component_bytes() and component_file_name() respectively. We can drop the directory_reject_invalid_name test - it's not possible anymore to pass an invalid name to Directories::add. Invalid names in the Directory proto are still being tested to be rejected in the validate_invalid_names tests. Change-Id: Ide4d16415dfd50b7e2d7e0c36d42a3bbeeb9b6c5 Reviewed-on: https://cl.tvl.fyi/c/depot/+/12217 Autosubmit: flokli <flokli@flokli.de> Reviewed-by: Connor Brewster <cbrewster@hey.com> Tested-by: BuildkiteCI
Diffstat (limited to 'tvix/castore/src/fixtures.rs')
| -rw-r--r-- | tvix/castore/src/fixtures.rs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tvix/castore/src/fixtures.rs b/tvix/castore/src/fixtures.rs index ddeacaf1d5b9..00cf3682d194 100644 --- a/tvix/castore/src/fixtures.rs +++ b/tvix/castore/src/fixtures.rs @@ -34,7 +34,7 @@ lazy_static! { pub static ref DIRECTORY_WITH_KEEP: Directory = { let mut dir = Directory::new(); dir.add( - ".keep".into(), + ".keep".try_into().unwrap(), Node::File{ digest: EMPTY_BLOB_DIGEST.clone(), size: 0, @@ -46,20 +46,20 @@ lazy_static! { pub static ref DIRECTORY_COMPLICATED: Directory = { let mut dir = Directory::new(); dir.add( - "keep".into(), + "keep".try_into().unwrap(), Node::Directory{ digest: DIRECTORY_WITH_KEEP.digest(), size: DIRECTORY_WITH_KEEP.size() }).unwrap(); dir.add( - ".keep".into(), + ".keep".try_into().unwrap(), Node::File{ digest: EMPTY_BLOB_DIGEST.clone(), size: 0, executable: false }).unwrap(); dir.add( - "aa".into(), + "aa".try_into().unwrap(), Node::Symlink{ target: "/nix/store/somewhereelse".try_into().unwrap() }).unwrap(); @@ -70,7 +70,7 @@ lazy_static! { pub static ref DIRECTORY_B: Directory = { let mut dir = Directory::new(); dir.add( - "a".into(), + "a".try_into().unwrap(), Node::Directory{ digest: DIRECTORY_A.digest(), size: DIRECTORY_A.size(), @@ -81,13 +81,13 @@ lazy_static! { pub static ref DIRECTORY_C: Directory = { let mut dir = Directory::new(); dir.add( - "a".into(), + "a".try_into().unwrap(), Node::Directory{ digest: DIRECTORY_A.digest(), size: DIRECTORY_A.size(), }).unwrap(); dir.add( - "a'".into(), + "a'".try_into().unwrap(), Node::Directory{ digest: DIRECTORY_A.digest(), size: DIRECTORY_A.size(), @@ -98,13 +98,13 @@ lazy_static! { pub static ref DIRECTORY_D: Directory = { let mut dir = Directory::new(); dir.add( - "a".into(), + "a".try_into().unwrap(), Node::Directory{ digest: DIRECTORY_A.digest(), size: DIRECTORY_A.size(), }).unwrap(); dir.add( - "b".into(), + "b".try_into().unwrap(), Node::Directory{ digest: DIRECTORY_B.digest(), size: DIRECTORY_B.size(), |