From 156a5a0fb6eeb231431a86f8d53f3ef50816c03d Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Thu, 28 Mar 2024 22:05:46 +0100
Subject: refactor(tvix/glue): drop ingest_entries_sync

Make this function async, and do the block_on on the (single) callsite.

Change-Id: Ib8b0b54ab5370fe02ef95f38a45d8866868a9d60
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11285
Reviewed-by: Connor Brewster <cbrewster@hey.com>
Tested-by: BuildkiteCI
---
 tvix/glue/src/builtins/import.rs | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'tvix/glue/src/builtins/import.rs')

diff --git a/tvix/glue/src/builtins/import.rs b/tvix/glue/src/builtins/import.rs
index 50b99690eefd..88e483031f46 100644
--- a/tvix/glue/src/builtins/import.rs
+++ b/tvix/glue/src/builtins/import.rs
@@ -102,12 +102,15 @@ async fn filtered_ingest(
 
     pin_mut!(entries_stream);
 
-    state
-        .ingest_entries_sync(entries_stream)
-        .map_err(|err| ErrorKind::IO {
-            path: Some(path.to_path_buf()),
-            error: err.into(),
-        })
+    state.tokio_handle.block_on(async {
+        state
+            .ingest_entries(entries_stream)
+            .await
+            .map_err(|err| ErrorKind::IO {
+                path: Some(path.to_path_buf()),
+                error: err.into(),
+            })
+    })
 }
 
 #[builtins(state = "Rc<TvixStoreIO>")]
-- 
cgit 1.4.1