refactor(tvix/castore): move *Node and Directory to crate root r/8486

*Node and Directory are types of the tvix-castore model, not the tvix
DirectoryService model. A DirectoryService only happens to send
Directories.

Move types into individual files in a nodes/ subdirectory, as it's
gotten too cluttered in a single file, and (re-)export all types from
the crate root.

This has the effect that we now cannot poke at private fields directly
from other files inside `crate::directoryservice` (as it's not all in
the same file anymore), but that's a good thing, it now forces us to go
through the proper accessors.

For the same reasons, we currently also need to introduce the `rename`
functions on each *Node directly.

A followup is gonna move the names out of the individual enum kinds, so
we can better represent "unnamed nodes".

Change-Id: Icdb34dcfe454c41c94f2396e8e99973d27db8418
Reviewed-on: https://cl.tvl.fyi/c/depot/+/12199
Reviewed-by: yuka <yuka@yuka.dev>
Autosubmit: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI

4 files changed, 7 insertions, 11 deletions

diff --git a/tvix/castore/src/fs/fuse/tests.rs b/tvix/castore/src/fs/fuse/tests.rs
index 726beb5858c5..3dad7d83aedd 100644
--- a/tvix/castore/src/fs/fuse/tests.rs
+++ b/tvix/castore/src/fs/fuse/tests.rs
@@ -15,10 +15,8 @@ use super::FuseDaemon;
 use crate::fs::{TvixStoreFs, XATTR_NAME_BLOB_DIGEST, XATTR_NAME_DIRECTORY_DIGEST};
 use crate::{
     blobservice::{BlobService, MemoryBlobService},
-    directoryservice::{
-        DirectoryNode, DirectoryService, FileNode, MemoryDirectoryService, Node, SymlinkNode,
-    },
-    fixtures,
+    directoryservice::{DirectoryService, MemoryDirectoryService},
+    fixtures, {DirectoryNode, FileNode, Node, SymlinkNode},
 };
 
 const BLOB_A_NAME: &str = "00000000000000000000000000000000-test";
diff --git a/tvix/castore/src/fs/inodes.rs b/tvix/castore/src/fs/inodes.rs
index 379d4ab87318..b04505c9fa98 100644
--- a/tvix/castore/src/fs/inodes.rs
+++ b/tvix/castore/src/fs/inodes.rs
@@ -4,8 +4,7 @@ use std::time::Duration;
 
 use bytes::Bytes;
 
-use crate::directoryservice::{NamedNode, Node};
-use crate::B3Digest;
+use crate::{B3Digest, NamedNode, Node};
 
 #[derive(Clone, Debug)]
 pub enum InodeData {
diff --git a/tvix/castore/src/fs/mod.rs b/tvix/castore/src/fs/mod.rs
index 4a6ca88d73fd..90c1f371b546 100644
--- a/tvix/castore/src/fs/mod.rs
+++ b/tvix/castore/src/fs/mod.rs
@@ -17,8 +17,8 @@ use self::{
 };
 use crate::{
     blobservice::{BlobReader, BlobService},
-    directoryservice::{DirectoryService, NamedNode, Node},
-    B3Digest,
+    directoryservice::DirectoryService,
+    {B3Digest, NamedNode, Node},
 };
 use bstr::ByteVec;
 use bytes::Bytes;
diff --git a/tvix/castore/src/fs/root_nodes.rs b/tvix/castore/src/fs/root_nodes.rs
index 6d78b243d064..c237142c8d91 100644
--- a/tvix/castore/src/fs/root_nodes.rs
+++ b/tvix/castore/src/fs/root_nodes.rs
@@ -1,7 +1,6 @@
 use std::collections::BTreeMap;
 
-use crate::{directoryservice::Node, Error};
-use bytes::Bytes;
+use crate::{Error, Node};
 use futures::stream::BoxStream;
 use tonic::async_trait;
 
@@ -23,7 +22,7 @@ pub trait RootNodes: Send + Sync {
 /// the key is the node name.
 impl<T> RootNodes for T
 where
-    T: AsRef<BTreeMap<Bytes, Node>> + Send + Sync,
+    T: AsRef<BTreeMap<bytes::Bytes, Node>> + Send + Sync,
 {
     async fn get_by_basename(&self, name: &[u8]) -> Result<Option<Node>, Error> {
         Ok(self.as_ref().get(name).cloned())