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/build | |
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/build')
-rw-r--r-- | tvix/build/src/proto/mod.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tvix/build/src/proto/mod.rs b/tvix/build/src/proto/mod.rs index d3b325bd3e62..b36049d05b9d 100644 --- a/tvix/build/src/proto/mod.rs +++ b/tvix/build/src/proto/mod.rs @@ -125,7 +125,7 @@ impl BuildRequest { pub fn validate(&self) -> Result<(), ValidateBuildRequestError> { // validate names. Make sure they're sorted - let mut last_name = bytes::Bytes::new(); + let mut last_name: bytes::Bytes = "".into(); for (i, node) in self.inputs.iter().enumerate() { // TODO(flokli): store result somewhere let (name, _node) = node @@ -133,10 +133,10 @@ impl BuildRequest { .into_name_and_node() .map_err(|e| ValidateBuildRequestError::InvalidInputNode(i, e))?; - if name <= last_name { + if name.as_ref() <= last_name.as_ref() { return Err(ValidateBuildRequestError::InputNodesNotSorted); } else { - last_name = name + last_name = name.into() } } |