diff options
author | Connor Brewster <cbrewster@hey.com> | 2024-01-20T22·25-0600 |
---|---|---|
committer | clbot <clbot@tvl.fyi> | 2024-01-21T19·41+0000 |
commit | 4e341fb5d915ea9e4ae1b8257972ef69437f3ed0 (patch) | |
tree | 6aeb960ced3e1c05edbc0c650ca608508cf0d920 /tvix/castore/src/proto/grpc_blobservice_wrapper.rs | |
parent | 56ba7a72d80bc050ef6a7d9031306ee0ccbf8e0a (diff) |
chore(tvix/store): Use BoxStream type alias r/7435
The BoxStream type alias is a more concise and easier to read than the full `Pin<Box<dyn Stream<Item = ...> + Send + ...>>` type. Change-Id: I5b7bccfd066ded5557e01f7895f4cf5c4a33bd44 Reviewed-on: https://cl.tvl.fyi/c/depot/+/10677 Reviewed-by: flokli <flokli@flokli.de> Tested-by: BuildkiteCI Autosubmit: Connor Brewster <cbrewster@hey.com>
Diffstat (limited to 'tvix/castore/src/proto/grpc_blobservice_wrapper.rs')
-rw-r--r-- | tvix/castore/src/proto/grpc_blobservice_wrapper.rs | 6 |
1 files changed, 2 insertions, 4 deletions
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<Target = dyn BlobService> + Send + Sync + 'static, { // https://github.com/tokio-rs/tokio/issues/2723#issuecomment-1534723933 - type ReadStream = - Pin<Box<dyn futures::Stream<Item = Result<super::BlobChunk, Status>> + Send + 'static>>; + type ReadStream = BoxStream<'static, Result<super::BlobChunk, Status>>; #[instrument(skip(self))] async fn stat( |