chore(tvix): simplify Cargo.toml

Use dotted keys where we'd else have maps with a single key.

Change-Id: I9389e0fedddad1cf65f870a3a68415a0defaa259
Reviewed-on: https://cl.tvl.fyi/c/depot/+/12929
Reviewed-by: Ilan Joselevich <personal@ilanjoselevich.com>
Autosubmit: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI

tvix/build/Cargo.toml

@@ -4,19 +4,19 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-bytes = { workspace = true }
+bytes.workspace = true
 clap = { workspace = true, features = ["derive", "env"] }
-itertools = { workspace = true }
+itertools.workspace = true
-prost = { workspace = true }
+prost.workspace = true
-thiserror = { workspace = true }
+thiserror.workspace = true
 tokio = { workspace = true, features = ["process"] }
 tokio-listener = { workspace = true, features = ["tonic012"] }
 tonic = { workspace = true, features = ["tls", "tls-roots"] }
 # TODO: put the fuse dep behind a feature flag?
 tvix-castore = { path = "../castore", features = ["fuse"]}
-tracing = { workspace = true }
+tracing.workspace = true
-url = { workspace = true }
+url.workspace = true
-mimalloc = { workspace = true }
+mimalloc.workspace = true
 tonic-reflection = { workspace = true, optional = true }
 
 anyhow = "1.0.79"
@@ -30,15 +30,15 @@ tvix-tracing = { path = "../tracing" }
 uuid = { version = "1.7.0", features = ["v4"] }
 
 [build-dependencies]
-prost-build = { workspace = true }
+prost-build.workspace = true
-tonic-build = { workspace = true }
+tonic-build.workspace = true
 
 [features]
 default = []
 tonic-reflection = ["dep:tonic-reflection", "tvix-castore/tonic-reflection"]
 
 [dev-dependencies]
-rstest = { workspace = true }
+rstest.workspace = true
 tempfile = "3.3.0"
 
 [lints]

tvix/castore/Cargo.toml

@@ -5,40 +5,40 @@ edition = "2021"
 
 [dependencies]
 async-compression = { workspace = true, features = ["tokio", "zstd"] }
-async-stream = { workspace = true }
+async-stream.workspace = true
-async-tempfile = { workspace = true }
+async-tempfile.workspace = true
 blake3 = { workspace = true, features = ["rayon", "std", "traits-preview"] }
-bstr = { workspace = true }
+bstr.workspace = true
-bytes = { workspace = true }
+bytes.workspace = true
-data-encoding = { workspace = true }
+data-encoding.workspace = true
-digest = { workspace = true }
+digest.workspace = true
 fastcdc = { workspace = true, features = ["tokio"] }
-futures = { workspace = true }
+futures.workspace = true
 object_store = { workspace = true, features = ["http"] }
-parking_lot = { workspace = true }
+parking_lot.workspace = true
-pin-project-lite = { workspace = true }
+pin-project-lite.workspace = true
-prost = { workspace = true }
+prost.workspace = true
-thiserror = { 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-tar.workspace = true
 tokio = { workspace = true, features = ["fs", "macros", "net", "rt", "rt-multi-thread", "signal"] }
-tonic = { workspace = true }
+tonic.workspace = true
-tower = { workspace = true }
+tower.workspace = true
-tracing = { workspace = true }
+tracing.workspace = true
-tracing-indicatif = { workspace = true }
+tracing-indicatif.workspace = true
 tvix-tracing = { path = "../tracing", features = ["tonic"] }
-url = { workspace = true }
+url.workspace = true
-walkdir = { workspace = true }
+walkdir.workspace = true
-zstd = { workspace = true }
+zstd.workspace = true
 serde = { workspace = true, features = ["derive"] }
-serde_with = { workspace = true }
+serde_with.workspace = true
-serde_qs = { workspace = true }
+serde_qs.workspace = true
-petgraph = { workspace = true }
+petgraph.workspace = true
-pin-project = { workspace = true }
+pin-project.workspace = true
-erased-serde = { workspace = true }
+erased-serde.workspace = true
-serde_tagged = { workspace = true }
+serde_tagged.workspace = true
-hyper-util = { workspace = true }
+hyper-util.workspace = true
 redb = { workspace = true, features = ["logging"] }
 bigtable_rs = { workspace = true, optional = true }
 fuse-backend-rs = { workspace = true, optional = true }
@@ -51,23 +51,23 @@ 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 }
+wu-manber.workspace = true
 auto_impl = "1.2.0"
 
 [build-dependencies]
-prost-build = { workspace = true }
+prost-build.workspace = true
-tonic-build = { workspace = true }
+tonic-build.workspace = true
 
 [dev-dependencies]
-async-process = { workspace = true }
+async-process.workspace = true
-rstest = { workspace = true }
+rstest.workspace = true
-tempfile = { workspace = true }
+tempfile.workspace = true
-tokio-retry = { workspace = true }
+tokio-retry.workspace = true
-hex-literal = { workspace = true }
+hex-literal.workspace = true
-rstest_reuse = { workspace = true }
+rstest_reuse.workspace = true
-xattr = { workspace = true }
+xattr.workspace = true
-serde_json = { workspace = true }
+serde_json.workspace = true
-tokio-test = { workspace = true }
+tokio-test.workspace = true
 
 [features]
 default = ["cloud"]

tvix/cli/Cargo.toml

@@ -13,23 +13,23 @@ tvix-store = { path = "../store", default-features = false, features = []}
 tvix-eval = { path = "../eval" }
 tvix-glue = { path = "../glue" }
 tvix-tracing = { path = "../tracing" }
-bytes = { workspace = true }
+bytes.workspace = true
 clap = { workspace = true, features = ["derive", "env"] }
-dirs = { workspace = true }
+dirs.workspace = true
-rustyline = { workspace = true }
+rustyline.workspace = true
-rnix = { workspace = true }
+rnix.workspace = true
-rowan = { workspace = true }
+rowan.workspace = true
-smol_str = { workspace = true }
+smol_str.workspace = true
-thiserror = { workspace = true }
+thiserror.workspace = true
-tokio = { workspace = true }
+tokio.workspace = true
-tracing = { workspace = true }
+tracing.workspace = true
-tracing-indicatif = { workspace = true }
+tracing-indicatif.workspace = true
-rustc-hash = { workspace = true }
+rustc-hash.workspace = true
-mimalloc = { workspace = true }
+mimalloc.workspace = true
-wu-manber = { workspace = true }
+wu-manber.workspace = true
 
 [dev-dependencies]
-expect-test = { workspace = true }
+expect-test.workspace = true
 
 [features]
 default = []

tvix/eval/Cargo.toml

@@ -8,42 +8,42 @@ name = "tvix_eval"
 
 [dependencies]
 builtin-macros = { path = "./builtin-macros", package = "tvix-eval-builtin-macros" }
-bytes = { workspace = true }
+bytes.workspace = true
 bstr = { workspace = true, features = ["serde"] }
-codemap = { workspace = true }
+codemap.workspace = true
-codemap-diagnostic = { workspace = true }
+codemap-diagnostic.workspace = true
-dirs = { workspace = true }
+dirs.workspace = true
-genawaiter = { workspace = true }
+genawaiter.workspace = true
-itertools = { workspace = true }
+itertools.workspace = true
 lexical-core = { workspace = true, features = ["format", "parse-floats"] }
 os_str_bytes = { workspace = true, features = ["conversions"] }
-path-clean = { workspace = true }
+path-clean.workspace = true
 proptest = { workspace = true, features = ["std", "alloc", "tempfile"], optional = true }
-regex = { workspace = true }
+regex.workspace = true
-rnix = { workspace = true }
+rnix.workspace = true
-rowan = { workspace = true } # pinned by rnix
+rowan.workspace = true # pinned by rnix
 serde = { workspace = true, features = ["rc", "derive"] }
-serde_json = { workspace = true }
+serde_json.workspace = true
-smol_str = { workspace = true }
+smol_str.workspace = true
-tabwriter = { workspace = true }
+tabwriter.workspace = true
 test-strategy = { workspace = true, optional = true }
 toml = "0.6.0"
-sha2 = { workspace = true }
+sha2.workspace = true
-sha1 = { workspace = true }
+sha1.workspace = true
-md-5 = { workspace = true }
+md-5.workspace = true
-data-encoding = { workspace = true }
+data-encoding.workspace = true
-rustc-hash = { workspace = true }
+rustc-hash.workspace = true
-nohash-hasher = { workspace = true }
+nohash-hasher.workspace = true
-vu128 = { workspace = true }
+vu128.workspace = true
 thiserror.workspace = true
 
 [dev-dependencies]
-criterion = { workspace = true }
+criterion.workspace = true
-itertools = { workspace = true }
+itertools.workspace = true
-mimalloc = { workspace = true }
+mimalloc.workspace = true
-pretty_assertions = { workspace = true }
+pretty_assertions.workspace = true
-rstest = { workspace = true }
+rstest.workspace = true
-tempfile = { workspace = true }
+tempfile.workspace = true
 
 [features]
 default = ["impure", "arbitrary", "nix_tests"]

tvix/eval/builtin-macros/Cargo.toml

@@ -6,8 +6,8 @@ edition = "2021"
 
 [dependencies]
 syn = { version = "1.0.109", features = ["full", "parsing", "printing", "visit", "visit-mut", "extra-traits"] }
-quote = { workspace = true }
+quote.workspace = true
-proc-macro2 = { workspace = true }
+proc-macro2.workspace = true
 
 [lib]
 proc-macro = true

tvix/glue/Cargo.toml

@@ -5,42 +5,42 @@ edition = "2021"
 
 [dependencies]
 async-compression = { workspace = true, features = ["tokio", "gzip", "bzip2", "xz"] }
-bstr = { workspace = true }
+bstr.workspace = true
-bytes = { workspace = true }
+bytes.workspace = true
-data-encoding = { workspace = true }
+data-encoding.workspace = true
-futures = { workspace = true }
+futures.workspace = true
-magic = { workspace = true }
+magic.workspace = true
 nix-compat = { path = "../nix-compat" }
-pin-project = { workspace = true }
+pin-project.workspace = true
 reqwest = { workspace = true, features = ["rustls-tls-native-roots"] }
 tvix-build = { path = "../build", default-features = false, features = []}
 tvix-eval = { path = "../eval" }
 tvix-castore = { path = "../castore" }
 tvix-store = { path = "../store", default-features = false, features = []}
 tvix-tracing = { path = "../tracing" }
-tracing = { workspace = true }
+tracing.workspace = true
-tracing-indicatif = { workspace = true }
+tracing-indicatif.workspace = true
-tokio = { workspace = true }
+tokio.workspace = true
-tokio-tar = { workspace = true }
+tokio-tar.workspace = true
 tokio-util = { workspace = true, features = ["io", "io-util", "compat"] }
-thiserror = { workspace = true }
+thiserror.workspace = true
-serde = { workspace = true }
+serde.workspace = true
-serde_json = { workspace = true }
+serde_json.workspace = true
-sha2 = { workspace = true }
+sha2.workspace = true
-sha1 = { workspace = true }
+sha1.workspace = true
-md-5 = { workspace = true }
+md-5.workspace = true
-url = { workspace = true }
+url.workspace = true
-walkdir = { workspace = true }
+walkdir.workspace = true
-clap = { workspace = true }
+clap.workspace = true
 
 [dev-dependencies]
 criterion = { workspace = true, features = ["html_reports"] }
-hex-literal = { workspace = true }
+hex-literal.workspace = true
-mimalloc = { workspace = true }
+mimalloc.workspace = true
 nix = { workspace = true, features = ["fs"] }
-pretty_assertions = { workspace = true }
+pretty_assertions.workspace = true
-rstest = { workspace = true }
+rstest.workspace = true
-tempfile = { workspace = true }
+tempfile.workspace = true
 
 [features]
 default = ["nix_tests"]

tvix/nar-bridge/Cargo.toml

@@ -5,20 +5,20 @@ edition = "2021"
 
 [dependencies]
 axum = { workspace = true, features = ["http2"] }
-axum-extra = { workspace = true }
+axum-extra.workspace = true
-axum-range = { workspace = true }
+axum-range.workspace = true
-tower = { workspace = true }
+tower.workspace = true
 tower-http = { workspace = true, features = ["compression-zstd", "trace"] }
-bytes = { workspace = true }
+bytes.workspace = true
 clap = { workspace = true, features = ["derive", "env"] }
-data-encoding = { workspace = true }
+data-encoding.workspace = true
-futures = { workspace = true }
+futures.workspace = true
-itertools = { workspace = true }
+itertools.workspace = true
-prost = { workspace = true }
+prost.workspace = true
 nix-compat = { path = "../nix-compat", features = ["async"] }
-opentelemetry = { workspace = true }
+opentelemetry.workspace = true
-thiserror = { workspace = true }
+thiserror.workspace = true
-tokio = { workspace = true }
+tokio.workspace = true
 tokio-listener = { workspace = true, features = ["axum07", "clap", "multi-listener", "sd_listen"] }
 tokio-util = { workspace = true, features = ["io", "io-util", "compat"] }
 tonic = { workspace = true, features = ["tls", "tls-roots"] }
@@ -26,18 +26,18 @@ tower-otel-http-metrics = { workspace = true, features = ["axum"], optional = tr
 tvix-castore = { path = "../castore" }
 tvix-store = { path = "../store" }
 tvix-tracing = { path = "../tracing", features = ["tonic", "axum"] }
-tracing = { workspace = true }
+tracing.workspace = true
-tracing-subscriber = { workspace = true }
+tracing-subscriber.workspace = true
-tracing-test = { workspace = true }
+tracing-test.workspace = true
-url = { workspace = true }
+url.workspace = true
 serde = { workspace = true, features = ["derive"] }
-lru = { workspace = true }
+lru.workspace = true
-parking_lot = { workspace = true }
+parking_lot.workspace = true
-mimalloc = { workspace = true }
+mimalloc.workspace = true
 
 [build-dependencies]
-prost-build = { workspace = true }
+prost-build.workspace = true
-tonic-build = { workspace = true }
+tonic-build.workspace = true
 
 [features]
 default = ["otlp"]
@@ -46,8 +46,8 @@ xp-store-composition-cli = ["tvix-store/xp-composition-cli"]
 
 [dev-dependencies]
 axum-test = "16.4.0"
-hex-literal = { workspace = true }
+hex-literal.workspace = true
-rstest = { workspace = true }
+rstest.workspace = true
 sha2.workspace = true
 
 [lints]

tvix/nix-compat-derive-tests/Cargo.toml

@@ -7,11 +7,11 @@ edition = "2021"
 compile-tests = []
 
 [dev-dependencies]
-hex-literal = { workspace = true }
+hex-literal.workspace = true
-pretty_assertions = { workspace = true }
+pretty_assertions.workspace = true
-rstest = { workspace = true }
+rstest.workspace = true
-tokio-test = { workspace = true }
+tokio-test.workspace = true
-trybuild = { workspace = true }
+trybuild.workspace = true
 tokio = { workspace = true, features = ["io-util", "macros"] }
 
 [dev-dependencies.nix-compat]

tvix/nix-compat-derive/Cargo.toml

@@ -12,11 +12,11 @@ quote = { workspace = true, features = ["proc-macro"] }
 syn = { version = "2.0.76", features = ["full", "extra-traits"] }
 
 [dev-dependencies]
-hex-literal = { workspace = true }
+hex-literal.workspace = true
-pretty_assertions = { workspace = true }
+pretty_assertions.workspace = true
 proptest = { workspace = true, features = ["std", "alloc", "tempfile"] }
-rstest = { workspace = true }
+rstest.workspace = true
-tokio-test = { workspace = true }
+tokio-test.workspace = true
 tokio = { workspace = true, features = ["io-util", "macros"] }
 
 [dev-dependencies.nix-compat]

tvix/nix-compat/Cargo.toml

@@ -17,22 +17,22 @@ test = []
 default = ["async", "daemon", "wire", "nix-compat-derive"]
 
 [dependencies]
-bitflags = { workspace = true }
+bitflags.workspace = true
 bstr = { workspace = true, features = ["alloc", "unicode", "serde"] }
-data-encoding = { workspace = true }
+data-encoding.workspace = true
-ed25519 = { workspace = true }
+ed25519.workspace = true
-ed25519-dalek = { workspace = true }
+ed25519-dalek.workspace = true
-enum-primitive-derive = { workspace = true }
+enum-primitive-derive.workspace = true
 futures = { workspace = true, optional = true }
-glob = { workspace = true }
+glob.workspace = true
-mimalloc = { workspace = true }
+mimalloc.workspace = true
-nom = { workspace = true }
+nom.workspace = true
-num-traits = { workspace = true }
+num-traits.workspace = true
 serde = { workspace = true, features = ["derive"] }
-serde_json = { workspace = true }
+serde_json.workspace = true
-sha2 = { workspace = true }
+sha2.workspace = true
-thiserror = { workspace = true }
+thiserror.workspace = true
-tracing = { workspace = true }
+tracing.workspace = true
 bytes = { workspace = true, optional = true }
 tokio = { workspace = true, features = ["io-util", "macros", "sync"], optional = true }
 pin-project-lite = { workspace = true, optional = true }
@@ -44,17 +44,17 @@ optional = true
 
 [dev-dependencies]
 criterion = { workspace = true, features = ["html_reports"] }
-futures = { workspace = true }
+futures.workspace = true
-hex-literal = { workspace = true }
+hex-literal.workspace = true
-mimalloc = { workspace = true }
+mimalloc.workspace = true
 mockall = "0.13.1"
-pretty_assertions = { workspace = true }
+pretty_assertions.workspace = true
 proptest = { workspace = true, features = ["std", "alloc", "tempfile"] }
-rstest = { workspace = true }
+rstest.workspace = true
-serde_json = { workspace = true }
+serde_json.workspace = true
-smol_str = { workspace = true }
+smol_str.workspace = true
-tokio-test = { workspace = true }
+tokio-test.workspace = true
-zstd = { workspace = true }
+zstd.workspace = true
 
 [[bench]]
 name = "derivation_parse_aterm"

tvix/nix-daemon/Cargo.toml

@@ -6,15 +6,15 @@ edition = "2021"
 [dependencies]
 async-trait = "0.1.83"
 clap = { workspace = true, features = ["derive", "env"] }
-futures = { workspace = true }
+futures.workspace = true
-mimalloc = { workspace = true }
+mimalloc.workspace = true
 nix-compat = { path = "../nix-compat" }
 tvix-castore = { path = "../castore" }
 tvix-store = { path = "../store" }
 tvix-tracing = { path = "../tracing" }
 tokio = { workspace = true, features = ["fs", "macros", "net", "rt", "rt-multi-thread", "signal"] }
-tokio-listener = { workspace = true }
+tokio-listener.workspace = true
-tracing = { workspace = true }
+tracing.workspace = true
 
 [lints]
 workspace = true

tvix/store/Cargo.toml

@@ -4,66 +4,66 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-anyhow = { workspace = true }
+anyhow.workspace = true
 async-compression = { workspace = true, features = ["tokio", "bzip2", "gzip", "xz", "zstd"] }
-async-stream = { workspace = true }
+async-stream.workspace = true
 blake3 = { workspace = true, features = ["rayon", "std"] }
-bstr = { workspace = true }
+bstr.workspace = true
-bytes = { workspace = true }
+bytes.workspace = true
 clap = { workspace = true, features = ["derive", "env"] }
-count-write = { workspace = true }
+count-write.workspace = true
-data-encoding = { workspace = true }
+data-encoding.workspace = true
-ed25519 = { workspace = true }
+ed25519.workspace = true
-ed25519-dalek = { workspace = true }
+ed25519-dalek.workspace = true
-futures = { workspace = true }
+futures.workspace = true
 nix-compat = { path = "../nix-compat", features = ["async"] }
-pin-project-lite = { workspace = true }
+pin-project-lite.workspace = true
-prost = { workspace = true }
+prost.workspace = true
 serde = { workspace = true, features = ["derive"] }
-serde_json = { workspace = true }
+serde_json.workspace = true
-serde_with = { workspace = true }
+serde_with.workspace = true
-serde_qs = { workspace = true }
+serde_qs.workspace = true
-sha1 = { workspace = true }
+sha1.workspace = true
-sha2 = { workspace = true }
+sha2.workspace = true
-md-5 = { workspace = true }
+md-5.workspace = true
-thiserror = { workspace = true }
+thiserror.workspace = true
 tokio = { workspace = true, features = ["fs", "macros", "net", "rt", "rt-multi-thread", "signal"] }
 tokio-listener = { workspace = true, features = ["clap", "multi-listener", "sd_listen", "tonic012"] }
 tokio-stream = { workspace = true, features = ["fs"] }
 tokio-util = { workspace = true, features = ["io", "io-util", "compat"] }
 tonic = { workspace = true, features = ["tls", "tls-roots"] }
-tower = { workspace = true }
+tower.workspace = true
 tower-http = { workspace = true, features = ["trace"] }
 tvix-castore = { path = "../castore" }
-url = { workspace = true }
+url.workspace = true
-walkdir = { workspace = true }
+walkdir.workspace = true
 reqwest = { workspace = true, features = ["rustls-tls-native-roots", "stream"] }
-reqwest-middleware = { workspace = true }
+reqwest-middleware.workspace = true
-lru = { workspace = true }
+lru.workspace = true
-parking_lot = { workspace = true }
+parking_lot.workspace = true
 tvix-tracing = { path = "../tracing", features = ["tonic", "reqwest"] }
-tracing = { workspace = true }
+tracing.workspace = true
-tracing-indicatif = { workspace = true }
+tracing-indicatif.workspace = true
-hyper-util = { workspace = true }
+hyper-util.workspace = true
 toml = { version = "0.8.19", optional = true }
-tonic-health = { workspace = true }
+tonic-health.workspace = true
 redb = { workspace = true, features = ["logging"] }
-mimalloc = { workspace = true }
+mimalloc.workspace = true
 tonic-reflection = { workspace = true, optional = true }
 bigtable_rs = { workspace = true, optional = true }
 auto_impl = "1.2.0"
 
 [build-dependencies]
-prost-build = { workspace = true }
+prost-build.workspace = true
-tonic-build = { workspace = true }
+tonic-build.workspace = true
 
 [dev-dependencies]
-async-process = { workspace = true }
+async-process.workspace = true
-rstest = { workspace = true }
+rstest.workspace = true
-rstest_reuse = { workspace = true }
+rstest_reuse.workspace = true
-tempfile = { workspace = true }
+tempfile.workspace = true
-tokio-retry = { workspace = true }
+tokio-retry.workspace = true
-hex-literal = { workspace = true }
+hex-literal.workspace = true
 
 [features]
 default = ["cloud", "fuse", "otlp", "tonic-reflection"]

tvix/tracing/Cargo.toml

@@ -6,10 +6,10 @@ edition = "2021"
 [dependencies]
 tracing = { workspace = true, features = ["max_level_trace", "release_max_level_debug"] }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
-indicatif = { workspace = true }
+indicatif.workspace = true
-tracing-indicatif = { workspace = true }
+tracing-indicatif.workspace = true
 tokio = { workspace = true, features = ["sync", "rt"] }
-thiserror = { workspace = true }
+thiserror.workspace = true
 
 tracing-opentelemetry = { workspace = true, optional = true }
 opentelemetry = { workspace = true, optional = true }