refactor(tvix): move refscan module to castore r/8724

This is required to add the optional refscanner parameter to the
ingest functions.

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

7 files changed, 19 insertions, 13 deletions

diff --git a/tvix/Cargo.lock b/tvix/Cargo.lock
index 19adc7bfe2a2..6ce289f1a4d4 100644
--- a/tvix/Cargo.lock
+++ b/tvix/Cargo.lock
@@ -4510,6 +4510,7 @@ dependencies = [
  "object_store",
  "parking_lot 0.12.3",
  "petgraph",
+ "pin-project",
  "pin-project-lite",
  "prost",
  "prost-build",
@@ -4529,6 +4530,7 @@ dependencies = [
  "tokio-retry",
  "tokio-stream",
  "tokio-tar",
+ "tokio-test",
  "tokio-util",
  "tonic",
  "tonic-build",
@@ -4545,6 +4547,7 @@ dependencies = [
  "vm-memory",
  "vmm-sys-util",
  "walkdir",
+ "wu-manber",
  "xattr",
  "zstd",
 ]
@@ -4658,7 +4661,6 @@ dependencies = [
  "thiserror",
  "tokio",
  "tokio-tar",
- "tokio-test",
  "tokio-util",
  "tracing",
  "tracing-indicatif",
@@ -4669,7 +4671,6 @@ dependencies = [
  "tvix-tracing",
  "url",
  "walkdir",
- "wu-manber",
 ]
 
 [[package]]
diff --git a/tvix/Cargo.nix b/tvix/Cargo.nix
index 77719d745ad7..84003aeeacc9 100644
--- a/tvix/Cargo.nix
+++ b/tvix/Cargo.nix
@@ -14815,6 +14815,10 @@ rec {
             packageId = "petgraph";
           }
           {
+            name = "pin-project";
+            packageId = "pin-project";
+          }
+          {
             name = "pin-project-lite";
             packageId = "pin-project-lite";
           }
@@ -14940,6 +14944,10 @@ rec {
             packageId = "walkdir";
           }
           {
+            name = "wu-manber";
+            packageId = "wu-manber";
+          }
+          {
             name = "zstd";
             packageId = "zstd";
           }
@@ -14984,6 +14992,10 @@ rec {
             packageId = "tokio-retry";
           }
           {
+            name = "tokio-test";
+            packageId = "tokio-test";
+          }
+          {
             name = "xattr";
             packageId = "xattr";
           }
@@ -15440,10 +15452,6 @@ rec {
             name = "walkdir";
             packageId = "walkdir";
           }
-          {
-            name = "wu-manber";
-            packageId = "wu-manber";
-          }
         ];
         devDependencies = [
           {
@@ -15480,10 +15488,6 @@ rec {
             name = "tempfile";
             packageId = "tempfile";
           }
-          {
-            name = "tokio-test";
-            packageId = "tokio-test";
-          }
         ];
         features = {
           "default" = [ "nix_tests" ];
diff --git a/tvix/castore/Cargo.toml b/tvix/castore/Cargo.toml
index b6752ae25af5..d752802acb69 100644
--- a/tvix/castore/Cargo.toml
+++ b/tvix/castore/Cargo.toml
@@ -37,6 +37,7 @@ serde = { workspace = true, features = ["derive"] }
 serde_with = { workspace = true }
 serde_qs = { workspace = true }
 petgraph = { workspace = true }
+pin-project = { workspace = true }
 erased-serde = { workspace = true }
 serde_tagged = { workspace = true }
 hyper-util = { workspace = true }
@@ -52,6 +53,7 @@ virtio-queue = { workspace = true, optional = true }
 vm-memory = { workspace = true, optional = true }
 vmm-sys-util = { workspace = true, optional = true }
 virtio-bindings = { workspace = true, optional = true }
+wu-manber = { workspace = true }
 
 [build-dependencies]
 prost-build = { workspace = true }
@@ -66,6 +68,7 @@ hex-literal = { workspace = true }
 rstest_reuse = { workspace = true }
 xattr = { workspace = true }
 serde_json = { workspace = true }
+tokio-test = { workspace = true }
 
 [features]
 default = ["cloud"]
diff --git a/tvix/castore/src/lib.rs b/tvix/castore/src/lib.rs
index 8ac6ca3dd66a..93d06fd4582d 100644
--- a/tvix/castore/src/lib.rs
+++ b/tvix/castore/src/lib.rs
@@ -6,6 +6,7 @@ pub mod blobservice;
 pub mod composition;
 pub mod directoryservice;
 pub mod fixtures;
+pub mod refscan;
 
 #[cfg(feature = "fs")]
 pub mod fs;
diff --git a/tvix/glue/src/refscan.rs b/tvix/castore/src/refscan.rs
index 80a126349746..80a126349746 100644
--- a/tvix/glue/src/refscan.rs
+++ b/tvix/castore/src/refscan.rs
diff --git a/tvix/glue/Cargo.toml b/tvix/glue/Cargo.toml
index bb522dceb902..4836e1e3a5d8 100644
--- a/tvix/glue/Cargo.toml
+++ b/tvix/glue/Cargo.toml
@@ -32,7 +32,6 @@ md-5 = { workspace = true }
 url = { workspace = true }
 walkdir = { workspace = true }
 clap = { workspace = true }
-wu-manber = { workspace = true }
 
 [dev-dependencies]
 criterion = { workspace = true, features = ["html_reports"] }
@@ -43,7 +42,6 @@ nix = { workspace = true, features = ["fs"] }
 pretty_assertions = { workspace = true }
 rstest = { workspace = true }
 tempfile = { workspace = true }
-tokio-test = { workspace = true }
 
 [features]
 default = ["nix_tests"]
diff --git a/tvix/glue/src/lib.rs b/tvix/glue/src/lib.rs
index f6f99f3c32a3..320d1f6fede2 100644
--- a/tvix/glue/src/lib.rs
+++ b/tvix/glue/src/lib.rs
@@ -1,7 +1,6 @@
 pub mod builtins;
 pub mod fetchers;
 pub mod known_paths;
-pub mod refscan;
 pub mod tvix_build;
 pub mod tvix_io;
 pub mod tvix_store_io;