about summary refs log tree commit diff
path: root/tvix/castore/src/import
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2024-05-05T08·08+0300
committerflokli <flokli@flokli.de>2024-05-05T14·54+0000
commit281bd46a43437c02435a67239c47994b7636ba66 (patch)
treefbb11d65015fc6de6240a500a64eaa11e26be742 /tvix/castore/src/import
parent08feea4817a5827db478d4202e58290d547f8cde (diff)
feat(tvix-castore/import) have IngestionEntry.path() return &Path r/8076
There's no need for this to be a &PathBuf.

Change-Id: I2d4126d57cfd8ddaad5dd327943b70b83d45c749
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11589
Tested-by: BuildkiteCI
Reviewed-by: Connor Brewster <cbrewster@hey.com>
Diffstat (limited to 'tvix/castore/src/import')
-rw-r--r--tvix/castore/src/import/archive.rs4
-rw-r--r--tvix/castore/src/import/mod.rs3
2 files changed, 4 insertions, 3 deletions
diff --git a/tvix/castore/src/import/archive.rs b/tvix/castore/src/import/archive.rs
index 0d21481d40e7..0ebb4a236117 100644
--- a/tvix/castore/src/import/archive.rs
+++ b/tvix/castore/src/import/archive.rs
@@ -288,12 +288,12 @@ impl IngestionEntryGraph {
             None => self.graph.add_node(entry),
         };
 
-        // A path with 1 component is the root node
+        // for archives, a path with 1 component is the root node
         if path.components().count() == 1 {
             // We expect archives to contain a single root node, if there is another root node
             // entry with a different path name, this is unsupported.
             if let Some(root_node) = self.root_node {
-                if self.get_node(root_node).path() != &path {
+                if self.get_node(root_node).path() != path.as_ref() {
                     return Err(Error::UnexpectedNumberOfTopLevelEntries);
                 }
             }
diff --git a/tvix/castore/src/import/mod.rs b/tvix/castore/src/import/mod.rs
index 7b42644a2779..6c69d04f3026 100644
--- a/tvix/castore/src/import/mod.rs
+++ b/tvix/castore/src/import/mod.rs
@@ -13,6 +13,7 @@ use crate::proto::DirectoryNode;
 use crate::proto::FileNode;
 use crate::proto::SymlinkNode;
 use crate::B3Digest;
+use crate::Path;
 use futures::{Stream, StreamExt};
 
 use tracing::Level;
@@ -183,7 +184,7 @@ pub enum IngestionEntry {
 }
 
 impl IngestionEntry {
-    fn path(&self) -> &PathBuf {
+    fn path(&self) -> &Path {
         match self {
             IngestionEntry::Regular { path, .. } => path,
             IngestionEntry::Symlink { path, .. } => path,