about summary refs log tree commit diff
diff options
context:
space:
mode:
authorIlan Joselevich <personal@ilanjoselevich.com>2024-08-29T15·11+0300
committerclbot <clbot@tvl.fyi>2024-08-30T13·55+0000
commit9803712ab8db5e71354ee192776c00f85b9b0ffb (patch)
tree420b3817ed2a890617629a4edbc11163807e58c1
parent55b0726571fa5481dc604bb28cdc204fada495a3 (diff)
fix(tvix): Follow-up fixing no-default-features and comments r/8619
In https://cl.tvl.fyi/c/depot/+/12389 I accidentally deleted some
comments. Also fixed some useless no-default-features with futures crate, making it match the previous feature combination.

Change-Id: I72bb2cfb88719ff2f8812d90193de2bd49149cce
Reviewed-on: https://cl.tvl.fyi/c/depot/+/12395
Autosubmit: Ilan Joselevich <personal@ilanjoselevich.com>
Reviewed-by: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
-rw-r--r--tvix/Cargo.nix6
-rw-r--r--tvix/Cargo.toml4
-rw-r--r--tvix/nix-compat/Cargo.toml2
3 files changed, 4 insertions, 8 deletions
diff --git a/tvix/Cargo.nix b/tvix/Cargo.nix
index 4cb07f1a13e0..5671624ceceb 100644
--- a/tvix/Cargo.nix
+++ b/tvix/Cargo.nix
@@ -6627,7 +6627,6 @@ rec {
           {
             name = "futures";
             packageId = "futures";
-            usesDefaultFeatures = false;
           }
           {
             name = "itertools";
@@ -7043,8 +7042,6 @@ rec {
           {
             name = "futures";
             packageId = "futures";
-            usesDefaultFeatures = false;
-            features = [ "executor" ];
           }
           {
             name = "hex-literal";
@@ -14790,7 +14787,6 @@ rec {
           {
             name = "futures";
             packageId = "futures";
-            usesDefaultFeatures = false;
           }
           {
             name = "hyper-util";
@@ -15346,7 +15342,6 @@ rec {
           {
             name = "futures";
             packageId = "futures";
-            usesDefaultFeatures = false;
           }
           {
             name = "magic";
@@ -15576,7 +15571,6 @@ rec {
           {
             name = "futures";
             packageId = "futures";
-            usesDefaultFeatures = false;
           }
           {
             name = "hyper-util";
diff --git a/tvix/Cargo.toml b/tvix/Cargo.toml
index 556a2719c030..7387bf2424f2 100644
--- a/tvix/Cargo.toml
+++ b/tvix/Cargo.toml
@@ -46,6 +46,7 @@ async-process = "2.2.4"
 async-stream = "0.3.5"
 async-tempfile = "0.4.0"
 axum = "0.7.5"
+# https://github.com/liufuyang/bigtable_rs/pull/86
 bigtable_rs = { git = "https://github.com/liufuyang/bigtable_rs", rev = "1818355a5373a5bc2c84287e3a4e3807154ac8ef" }
 bitflags = "2.6.0"
 blake3 = "1.5.4"
@@ -66,7 +67,7 @@ erased-serde = "0.4.5"
 expect-test = "1.5.0"
 fastcdc = "3.1.0"
 fuse-backend-rs = "0.11.0"
-futures = { version = "0.3.30", default-features = false }
+futures = "0.3.30"
 genawaiter = { version = "0.99.1", default-features = false }
 glob = "0.3.1"
 hex-literal = "0.4.1"
@@ -155,6 +156,7 @@ vm-memory = "0.10"
 vmm-sys-util = "0.11"
 vu128 = "1.1.0"
 walkdir = "2.5.0"
+# https://github.com/jneem/wu-manber/pull/1
 wu-manber = { git = "https://github.com/tvlfyi/wu-manber.git" }
 xattr = "1.3.1"
 zstd = "0.13.2"
diff --git a/tvix/nix-compat/Cargo.toml b/tvix/nix-compat/Cargo.toml
index ac56bb59cab2..58137e4de2e1 100644
--- a/tvix/nix-compat/Cargo.toml
+++ b/tvix/nix-compat/Cargo.toml
@@ -39,7 +39,7 @@ optional = true
 
 [dev-dependencies]
 criterion = { workspace = true, features = ["html_reports"] }
-futures = { workspace = true, features = ["executor"] }
+futures = { workspace = true }
 hex-literal = { workspace = true }
 lazy_static = { workspace = true }
 mimalloc = { workspace = true }