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/fs/root_nodes.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tvix/castore/src/fs') diff --git a/tvix/castore/src/fs/root_nodes.rs b/tvix/castore/src/fs/root_nodes.rs index a603fd1b37d5..6609e049a1fc 100644 --- a/tvix/castore/src/fs/root_nodes.rs +++ b/tvix/castore/src/fs/root_nodes.rs @@ -1,8 +1,8 @@ -use std::{collections::BTreeMap, pin::Pin}; +use std::collections::BTreeMap; use crate::{proto::node::Node, Error}; use bytes::Bytes; -use futures::Stream; +use futures::stream::BoxStream; use tonic::async_trait; /// Provides an interface for looking up root nodes in tvix-castore by given @@ -15,7 +15,7 @@ pub trait RootNodes: Send + Sync { /// Lists all root CA nodes in the filesystem. An error can be returned /// in case listing is not allowed - fn list(&self) -> Pin> + Send + '_>>; + fn list(&self) -> BoxStream>; } #[async_trait] @@ -29,7 +29,7 @@ where Ok(self.as_ref().get(name).cloned()) } - fn list(&self) -> Pin> + Send + '_>> { + fn list(&self) -> BoxStream> { Box::pin(tokio_stream::iter( self.as_ref().iter().map(|(_, v)| Ok(v.clone())), )) -- cgit 1.4.1