From 7923cc19f698bdd128f93087d203cd6182b21ef2 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 5 Sep 2023 15:22:57 +0300
Subject: refactor(tvix/store): use tokio::task::JoinHandle

This makes the inside code a bit less verbose.

I wasn't able to describe the type of the async move closure itself,
which would allow us to remove the JoinHandle<_> type annotation
entirely.

Change-Id: I06193982a0c7010bd72d3ffa4f760bea1b097632
Reviewed-on: https://cl.tvl.fyi/c/depot/+/9268
Autosubmit: flokli <flokli@flokli.de>
Reviewed-by: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
---
 tvix/store/src/pathinfoservice/grpc.rs | 40 ++++++++++++++++------------------
 1 file changed, 19 insertions(+), 21 deletions(-)

(limited to 'tvix/store/src/pathinfoservice/grpc.rs')

diff --git a/tvix/store/src/pathinfoservice/grpc.rs b/tvix/store/src/pathinfoservice/grpc.rs
index 2bd766697bd1..1649655b69ea 100644
--- a/tvix/store/src/pathinfoservice/grpc.rs
+++ b/tvix/store/src/pathinfoservice/grpc.rs
@@ -5,7 +5,7 @@ use crate::{
     proto::{self, ListPathInfoRequest},
 };
 use std::sync::Arc;
-use tokio::net::UnixStream;
+use tokio::{net::UnixStream, task::JoinHandle};
 use tonic::{transport::Channel, Code, Status, Streaming};
 
 /// Connects to a (remote) tvix-store PathInfoService over gRPC.
@@ -96,7 +96,7 @@ impl PathInfoService for GRPCPathInfoService {
         // Get a new handle to the gRPC client.
         let mut grpc_client = self.grpc_client.clone();
 
-        let task: tokio::task::JoinHandle<Result<proto::PathInfo, Status>> =
+        let task: JoinHandle<Result<proto::PathInfo, Status>> =
             self.tokio_handle.spawn(async move {
                 let path_info = grpc_client
                     .get(proto::GetPathInfoRequest {
@@ -121,7 +121,7 @@ impl PathInfoService for GRPCPathInfoService {
         // Get a new handle to the gRPC client.
         let mut grpc_client = self.grpc_client.clone();
 
-        let task: tokio::task::JoinHandle<Result<proto::PathInfo, Status>> =
+        let task: JoinHandle<Result<proto::PathInfo, Status>> =
             self.tokio_handle.spawn(async move {
                 let path_info = grpc_client.put(path_info).await?.into_inner();
                 Ok(path_info)
@@ -140,16 +140,15 @@ impl PathInfoService for GRPCPathInfoService {
         let mut grpc_client = self.grpc_client.clone();
         let root_node = root_node.clone();
 
-        let task: tokio::task::JoinHandle<Result<_, Status>> =
-            self.tokio_handle.spawn(async move {
-                let path_info = grpc_client
-                    .calculate_nar(proto::Node {
-                        node: Some(root_node),
-                    })
-                    .await?
-                    .into_inner();
-                Ok(path_info)
-            });
+        let task: JoinHandle<Result<_, Status>> = self.tokio_handle.spawn(async move {
+            let path_info = grpc_client
+                .calculate_nar(proto::Node {
+                    node: Some(root_node),
+                })
+                .await?
+                .into_inner();
+            Ok(path_info)
+        });
 
         let resp = self
             .tokio_handle
@@ -169,15 +168,14 @@ impl PathInfoService for GRPCPathInfoService {
         // Get a new handle to the gRPC client.
         let mut grpc_client = self.grpc_client.clone();
 
-        let task: tokio::task::JoinHandle<Result<_, Status>> =
-            self.tokio_handle.spawn(async move {
-                let s = grpc_client
-                    .list(ListPathInfoRequest::default())
-                    .await?
-                    .into_inner();
+        let task: JoinHandle<Result<_, Status>> = self.tokio_handle.spawn(async move {
+            let s = grpc_client
+                .list(ListPathInfoRequest::default())
+                .await?
+                .into_inner();
 
-                Ok(s)
-            });
+            Ok(s)
+        });
 
         let stream = self.tokio_handle.block_on(task).unwrap().unwrap();
 
-- 
cgit 1.4.1