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/glue/src | |
| 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/glue/src')
| -rw-r--r-- | tvix/glue/src/tvix_store_io.rs | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/tvix/glue/src/tvix_store_io.rs b/tvix/glue/src/tvix_store_io.rs index 234a5ef38f43..0833fc45e132 100644 --- a/tvix/glue/src/tvix_store_io.rs +++ b/tvix/glue/src/tvix_store_io.rs @@ -314,7 +314,7 @@ impl TvixStoreIO { // assemble the PathInfo to persist let path_info = PathInfo { node: Some(tvix_castore::proto::Node::from_name_and_node( - output_name, + output_name.into(), output_node, )), references: vec![], // TODO: refscan @@ -355,7 +355,9 @@ impl TvixStoreIO { .outputs .into_iter() .map(|e| e.into_name_and_node().expect("invalid node")) - .find(|(output_name, _output_node)| output_name == s.as_bytes()) + .find(|(output_name, _output_node)| { + output_name.as_ref() == s.as_bytes() + }) .expect("build didn't produce the store path") .1 } @@ -562,9 +564,13 @@ impl EvalIO for TvixStoreIO { // TODO: into_nodes() to avoid cloning for (name, node) in directory.nodes() { children.push(match node { - Node::Directory { .. } => (name.clone(), FileType::Directory), - Node::File { .. } => (name.clone(), FileType::Regular), - Node::Symlink { .. } => (name.clone(), FileType::Symlink), + Node::Directory { .. } => { + (name.clone().into(), FileType::Directory) + } + Node::File { .. } => (name.clone().into(), FileType::Regular), + Node::Symlink { .. } => { + (name.clone().into(), FileType::Symlink) + } }) } Ok(children) |