diff options
| author | Florian Klink <flokli@flokli.de> | 2024-08-13T17·04+0300 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2024-08-13T18·39+0000 |
| commit | c7845f3c882d0f1b215813bf0ef8231c2c03d7b6 (patch) | |
| tree | 681774cbfa98e5021aa68b361bc937b88881b5c8 /tvix/glue/src/builtins/import.rs | |
| parent | 2f4185ff1a54e1bdbaa062a9e4e1c8137d141762 (diff) | |
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
Diffstat (limited to 'tvix/glue/src/builtins/import.rs')
| -rw-r--r-- | tvix/glue/src/builtins/import.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tvix/glue/src/builtins/import.rs b/tvix/glue/src/builtins/import.rs index aa0d0d54fc8a..1cf4145427b8 100644 --- a/tvix/glue/src/builtins/import.rs +++ b/tvix/glue/src/builtins/import.rs @@ -2,9 +2,8 @@ use crate::builtins::errors::ImportError; use std::path::Path; -use tvix_castore::directoryservice::FileNode; -use tvix_castore::directoryservice::Node; use tvix_castore::import::ingest_entries; +use tvix_castore::{FileNode, Node}; use tvix_eval::{ builtin_macros::builtins, generators::{self, GenCo}, |