about summary refs log tree commit diff
path: root/tvix
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2024-03-28T21·01+0100
committerflokli <flokli@flokli.de>2024-03-28T21·17+0000
commitbd32024047f4977b95ae9c04c1f7b2ad3b103a91 (patch)
treeab2f324b2a1102d0ab893bb8a6df0c46686fd1a4 /tvix
parentf1e6f9807252bdeee5c33dcaf288550eaec77282 (diff)
refactor(tvix/glue): drop register_node_in_path_info_service_sync r/7799
Replace the (single) callsite with some code interacting with the tokio
runtime to block on the async version.

Change-Id: I3976496ae77b2bb8734603f303655834265e3f0a
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11284
Tested-by: BuildkiteCI
Reviewed-by: Connor Brewster <cbrewster@hey.com>
Diffstat (limited to 'tvix')
-rw-r--r--tvix/glue/src/builtins/import.rs7
-rw-r--r--tvix/glue/src/tvix_store_io.rs12
2 files changed, 6 insertions, 13 deletions
diff --git a/tvix/glue/src/builtins/import.rs b/tvix/glue/src/builtins/import.rs
index 08f8a40636ae..50b99690eefd 100644
--- a/tvix/glue/src/builtins/import.rs
+++ b/tvix/glue/src/builtins/import.rs
@@ -133,7 +133,12 @@ mod import_builtins {
         let name = tvix_store::import::path_to_name(&p)?;
 
         Ok(state
-            .register_node_in_path_info_service_sync(name, &p, root_node)
+            .tokio_handle
+            .block_on(async {
+                state
+                    .register_node_in_path_info_service(name, &p, root_node)
+                    .await
+            })
             .map_err(|err| ErrorKind::IO {
                 path: Some(p.to_path_buf()),
                 error: err.into(),
diff --git a/tvix/glue/src/tvix_store_io.rs b/tvix/glue/src/tvix_store_io.rs
index e768e1475c94..dc1974527b13 100644
--- a/tvix/glue/src/tvix_store_io.rs
+++ b/tvix/glue/src/tvix_store_io.rs
@@ -334,18 +334,6 @@ impl TvixStoreIO {
         Ok(output_path)
     }
 
-    pub(crate) fn register_node_in_path_info_service_sync(
-        &self,
-        name: &str,
-        path: &Path,
-        root_node: Node,
-    ) -> io::Result<StorePath> {
-        self.tokio_handle.block_on(async {
-            self.register_node_in_path_info_service(name, path, root_node)
-                .await
-        })
-    }
-
     pub async fn store_path_exists<'a>(&'a self, store_path: StorePathRef<'a>) -> io::Result<bool> {
         Ok(self
             .path_info_service