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/import/mod.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/import/mod.rs')
| -rw-r--r-- | tvix/castore/src/import/mod.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tvix/castore/src/import/mod.rs b/tvix/castore/src/import/mod.rs index 9fce22585f60..a7c459fdb56a 100644 --- a/tvix/castore/src/import/mod.rs +++ b/tvix/castore/src/import/mod.rs @@ -123,9 +123,8 @@ where .path() .file_name() // If this is the root node, it will have an empty name. - .unwrap_or_default() - .to_owned() - .into(); + .unwrap_or_else(|| "".try_into().unwrap()) + .to_owned(); // record node in parent directory, creating a new [Directory] if not there yet. directories |