From 4e341fb5d915ea9e4ae1b8257972ef69437f3ed0 Mon Sep 17 00:00:00 2001 From: Connor Brewster Date: Sat, 20 Jan 2024 16:25:39 -0600 Subject: chore(tvix/store): Use BoxStream type alias The BoxStream type alias is a more concise and easier to read than the full `Pin + Send + ...>>` type. Change-Id: I5b7bccfd066ded5557e01f7895f4cf5c4a33bd44 Reviewed-on: https://cl.tvl.fyi/c/depot/+/10677 Reviewed-by: flokli Tested-by: BuildkiteCI Autosubmit: Connor Brewster --- tvix/castore/src/proto/grpc_blobservice_wrapper.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'tvix/castore/src/proto/grpc_blobservice_wrapper.rs') diff --git a/tvix/castore/src/proto/grpc_blobservice_wrapper.rs b/tvix/castore/src/proto/grpc_blobservice_wrapper.rs index 063f0421ddee..f8c2341689c6 100644 --- a/tvix/castore/src/proto/grpc_blobservice_wrapper.rs +++ b/tvix/castore/src/proto/grpc_blobservice_wrapper.rs @@ -1,11 +1,10 @@ use crate::blobservice::BlobService; use core::pin::pin; -use futures::TryFutureExt; +use futures::{stream::BoxStream, TryFutureExt}; use std::{ collections::VecDeque, io, ops::{Deref, DerefMut}, - pin::Pin, }; use tokio_stream::StreamExt; use tokio_util::io::ReaderStream; @@ -86,8 +85,7 @@ where T: Deref + Send + Sync + 'static, { // https://github.com/tokio-rs/tokio/issues/2723#issuecomment-1534723933 - type ReadStream = - Pin> + Send + 'static>>; + type ReadStream = BoxStream<'static, Result>; #[instrument(skip(self))] async fn stat( -- cgit 1.4.1