From 5a97888d8b9df1815cee3d577ea95a44f188434f Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Thu, 29 Aug 2024 00:54:46 +0300 Subject: chore(tvix): Migrate members to inherit deps from workspace From now on we will add the dependencies and their version in the root Cargo.toml and in order to enable the dependency for a workspace member we set `workspace = true` in the member's Cargo.toml. Change-Id: I9738c1cf99810b7ace87ca712c3ea965ba846e25 Reviewed-on: https://cl.tvl.fyi/c/depot/+/12389 Autosubmit: Ilan Joselevich Tested-by: BuildkiteCI Reviewed-by: flokli --- tvix/castore/Cargo.toml | 149 ++++++++++++++++++------------------------------ 1 file changed, 57 insertions(+), 92 deletions(-) (limited to 'tvix/castore') diff --git a/tvix/castore/Cargo.toml b/tvix/castore/Cargo.toml index 0744a370f58e..b6752ae25af5 100644 --- a/tvix/castore/Cargo.toml +++ b/tvix/castore/Cargo.toml @@ -4,103 +4,68 @@ version = "0.1.0" edition = "2021" [dependencies] -async-compression = { version = "0.4.12", features = ["tokio", "zstd"]} -async-stream = "0.3.5" -async-tempfile = "0.4.0" -blake3 = { version = "1.5.4", features = ["rayon", "std", "traits-preview"] } -bstr = "1.10.0" -bytes = "1.7.1" -data-encoding = "2.6.0" -digest = "0.10.7" -fastcdc = { version = "3.1.0", features = ["tokio"] } -futures = "0.3.30" -lazy_static = "1.5.0" -object_store = { version = "0.10.2", features = ["http"] } -parking_lot = "0.12.3" -pin-project-lite = "0.2.14" -prost = "0.13.1" -sled = { version = "0.34.7" } -thiserror = "1.0.63" -tokio-stream = { version = "0.1.15", features = ["fs", "net"] } -tokio-util = { version = "0.7.11", features = ["io", "io-util", "codec"] } -tokio-tar = "0.3.1" -tokio = { version = "1.39.3", features = ["fs", "macros", "net", "rt", "rt-multi-thread", "signal"] } -tonic = "0.12.2" -tower = "0.4.13" -tracing = "0.1.40" -tracing-indicatif = "0.3.6" +async-compression = { workspace = true, features = ["tokio", "zstd"] } +async-stream = { workspace = true } +async-tempfile = { workspace = true } +blake3 = { workspace = true, features = ["rayon", "std", "traits-preview"] } +bstr = { workspace = true } +bytes = { workspace = true } +data-encoding = { workspace = true } +digest = { workspace = true } +fastcdc = { workspace = true, features = ["tokio"] } +futures = { workspace = true } +lazy_static = { workspace = true } +object_store = { workspace = true, features = ["http"] } +parking_lot = { workspace = true } +pin-project-lite = { workspace = true } +prost = { workspace = true } +sled = { workspace = true } +thiserror = { workspace = true } +tokio-stream = { workspace = true, features = ["fs", "net"] } +tokio-util = { workspace = true, features = ["io", "io-util", "codec"] } +tokio-tar = { workspace = true } +tokio = { workspace = true, features = ["fs", "macros", "net", "rt", "rt-multi-thread", "signal"] } +tonic = { workspace = true } +tower = { workspace = true } +tracing = { workspace = true } +tracing-indicatif = { workspace = true } tvix-tracing = { path = "../tracing", features = ["tonic"] } -url = "2.5.2" -walkdir = "2.5.0" -zstd = "0.13.2" -serde = { version = "1.0.209", features = [ "derive" ] } -serde_with = "3.9.0" -serde_qs = "0.12.0" -petgraph = "0.6.5" -erased-serde = "0.4.5" -serde_tagged = "0.3.0" -hyper-util = "0.1.7" -redb = "2.1.2" - -[dependencies.bigtable_rs] -optional = true -# https://github.com/liufuyang/bigtable_rs/pull/86 -git = "https://github.com/liufuyang/bigtable_rs" -rev = "1818355a5373a5bc2c84287e3a4e3807154ac8ef" - -[dependencies.fuse-backend-rs] -optional = true -version = "0.11.0" - -[dependencies.libc] -optional = true -version = "0.2.158" - -[dependencies.threadpool] -version = "1.8.1" -optional = true - -[dependencies.tonic-reflection] -optional = true -version = "0.12.2" - -[dependencies.vhost] -optional = true -version = "0.6" - -[dependencies.vhost-user-backend] -optional = true -version = "0.8" - -[dependencies.virtio-queue] -optional = true -version = "0.7" - -[dependencies.vm-memory] -optional = true -version = "0.10" - -[dependencies.vmm-sys-util] -optional = true -version = "0.11" - -[dependencies.virtio-bindings] -optional = true -version = "0.2.2" +url = { workspace = true } +walkdir = { workspace = true } +zstd = { workspace = true } +serde = { workspace = true, features = ["derive"] } +serde_with = { workspace = true } +serde_qs = { workspace = true } +petgraph = { workspace = true } +erased-serde = { workspace = true } +serde_tagged = { workspace = true } +hyper-util = { workspace = true } +redb = { workspace = true } +bigtable_rs = { workspace = true, optional = true } +fuse-backend-rs = { workspace = true, optional = true } +libc = { workspace = true, optional = true } +threadpool = { workspace = true, optional = true } +tonic-reflection = { workspace = true, optional = true } +vhost = { workspace = true, optional = true } +vhost-user-backend = { workspace = true, optional = true } +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 } [build-dependencies] -prost-build = "0.13.1" -tonic-build = "0.12.2" +prost-build = { workspace = true } +tonic-build = { workspace = true } [dev-dependencies] -async-process = "2.2.4" -rstest = "0.19.0" -tempfile = "3.12.0" -tokio-retry = "0.3.0" -hex-literal = "0.4.1" -rstest_reuse = "0.6.0" -xattr = "1.3.1" -serde_json = "*" +async-process = { workspace = true } +rstest = { workspace = true } +tempfile = { workspace = true } +tokio-retry = { workspace = true } +hex-literal = { workspace = true } +rstest_reuse = { workspace = true } +xattr = { workspace = true } +serde_json = { workspace = true } [features] default = ["cloud"] -- cgit 1.4.1