From 4528052eb78c4a180f52f9601bc727c56dc8b08d Mon Sep 17 00:00:00 2001
From: Evgeny Zemtsov <eze@resoptima.com>
Date: Thu, 22 Jun 2023 22:24:40 +0200
Subject: fix(tvix/serde): remove unnecessary dependency on genawaiter

Change-Id: I52f13c6b508793603bc726353e9bf7d5f12fddf4
Reviewed-on: https://cl.tvl.fyi/c/depot/+/8850
Reviewed-by: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
---
 tvix/Cargo.lock            | 1 -
 tvix/Cargo.nix             | 7 -------
 tvix/serde/Cargo.toml      | 5 +----
 tvix/serde/src/de_tests.rs | 3 +--
 4 files changed, 2 insertions(+), 14 deletions(-)

(limited to 'tvix')

diff --git a/tvix/Cargo.lock b/tvix/Cargo.lock
index 78758fa99822..7bcf60dceca3 100644
--- a/tvix/Cargo.lock
+++ b/tvix/Cargo.lock
@@ -2755,7 +2755,6 @@ dependencies = [
 name = "tvix-serde"
 version = "0.1.0"
 dependencies = [
- "genawaiter",
  "serde",
  "tvix-eval",
 ]
diff --git a/tvix/Cargo.nix b/tvix/Cargo.nix
index 6227178d88fd..df2b4495ae69 100644
--- a/tvix/Cargo.nix
+++ b/tvix/Cargo.nix
@@ -8169,13 +8169,6 @@ rec {
             packageId = "tvix-eval";
           }
         ];
-        devDependencies = [
-          {
-            name = "genawaiter";
-            packageId = "genawaiter";
-            usesDefaultFeatures = false;
-          }
-        ];
 
       };
       "tvix-store" = rec {
diff --git a/tvix/serde/Cargo.toml b/tvix/serde/Cargo.toml
index 774214eab667..e535f6e8a397 100644
--- a/tvix/serde/Cargo.toml
+++ b/tvix/serde/Cargo.toml
@@ -5,7 +5,4 @@ edition = "2021"
 
 [dependencies]
 tvix-eval = { path = "../eval" }
-serde = { version = "1.0", features = ["derive"] }
-
-[dev-dependencies]
-genawaiter = { version = "0.99.1", default_features = false }
\ No newline at end of file
+serde = { version = "1.0", features = ["derive"] }
\ No newline at end of file
diff --git a/tvix/serde/src/de_tests.rs b/tvix/serde/src/de_tests.rs
index a77a59f2b5cd..9764653caa86 100644
--- a/tvix/serde/src/de_tests.rs
+++ b/tvix/serde/src/de_tests.rs
@@ -213,8 +213,7 @@ fn deserialize_with_config() {
 
 #[builtins]
 mod test_builtins {
-    use genawaiter::rc::Gen;
-    use tvix_eval::generators::GenCo;
+    use tvix_eval::generators::{Gen, GenCo};
     use tvix_eval::{ErrorKind, NixString, Value};
 
     #[builtin("prependHello")]
-- 
cgit 1.4.1