From 7e737fde34260daa477794d63b0b3344b4a1d81b Mon Sep 17 00:00:00 2001 From: Connor Brewster Date: Sat, 16 Sep 2023 13:54:10 -0500 Subject: refactor(tvix/store/fs): Separate FUSE and filesystem code In prepration for adding virtiofs support, I thought it would make sense to split out the filesystem implementation from FUSE itself. The `fs` module holds the tvix-store filesystem implemetation and the `fuse` module holds the code to spawn a FUSE daemon backed by multiple threads. Change-Id: I8c58447b8c3aa016a613068f8e7ec166554e237c Reviewed-on: https://cl.tvl.fyi/c/depot/+/9343 Reviewed-by: flokli Tested-by: BuildkiteCI Autosubmit: Connor Brewster --- tvix/Cargo.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'tvix/Cargo.nix') diff --git a/tvix/Cargo.nix b/tvix/Cargo.nix index cd9570c48a..002aaeab09 100644 --- a/tvix/Cargo.nix +++ b/tvix/Cargo.nix @@ -8859,11 +8859,12 @@ rec { ]; features = { "default" = [ "fuse" "reflection" ]; - "fuse" = [ "dep:libc" "dep:fuse-backend-rs" ]; + "fs" = [ "dep:libc" "dep:fuse-backend-rs" ]; + "fuse" = [ "fs" ]; "reflection" = [ "tonic-reflection" ]; "tonic-reflection" = [ "dep:tonic-reflection" ]; }; - resolvedDefaultFeatures = [ "default" "fuse" "reflection" "tonic-reflection" ]; + resolvedDefaultFeatures = [ "default" "fs" "fuse" "reflection" "tonic-reflection" ]; }; "typenum" = rec { crateName = "typenum"; -- cgit 1.4.1