From c7845f3c882d0f1b215813bf0ef8231c2c03d7b6 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 13 Aug 2024 20:04:58 +0300 Subject: refactor(tvix/castore): move *Node and Directory to crate root *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 Autosubmit: flokli Tested-by: BuildkiteCI --- tvix/castore/src/fs/fuse/tests.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'tvix/castore/src/fs/fuse') 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"; -- cgit 1.4.1