feat: refactor implement MaybeSend for fs::list returning stream

tonbo-io · Dec 18, 2024 · 7029eba · 7029eba
1 parent 216eb44
commit 7029eba
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/fusio/src/dynamic/fs.rs b/fusio/src/dynamic/fs.rs
@@ -1,8 +1,6 @@
 use std::{cmp, pin::Pin, sync::Arc};
 
-use futures_core::Stream;
-
-use super::MaybeSendFuture;
+use super::{MaybeSendFuture, MaybeSendStream};
 use crate::{
     buf::IoBufMut,
     fs::{FileMeta, FileSystemTag, Fs, OpenOptions},
@@ -75,7 +73,7 @@ pub trait DynFs: MaybeSend + MaybeSync {
         Box<
             dyn MaybeSendFuture<
                     Output = Result<
-                        Pin<Box<dyn Stream<Item = Result<FileMeta, Error>> + 's>>,
+                        Pin<Box<dyn MaybeSendStream<Item = Result<FileMeta, Error>> + 's>>,
                         Error,
                     >,
                 > + 's,
@@ -130,15 +128,18 @@ impl<F: Fs> DynFs for F {
         Box<
             dyn MaybeSendFuture<
                     Output = Result<
-                        Pin<Box<dyn Stream<Item = Result<FileMeta, Error>> + 's>>,
+                        Pin<Box<dyn MaybeSendStream<Item = Result<FileMeta, Error>> + 's>>,
                         Error,
                     >,
                 > + 's,
         >,
     > {
         Box::pin(async move {
             let stream = F::list(self, path).await?;
-            Ok(Box::pin(stream) as Pin<Box<dyn Stream<Item = Result<FileMeta, Error>>>>)
+            Ok(Box::pin(stream)
+                as Pin<
+                    Box<dyn MaybeSendStream<Item = Result<FileMeta, Error>>>,
+                >)
         })
     }
 

diff --git a/fusio/src/dynamic/mod.rs b/fusio/src/dynamic/mod.rs
@@ -7,6 +7,7 @@ use std::{future::Future, pin::Pin};
 
 #[cfg(feature = "fs")]
 pub use fs::{DynFile, DynFs};
+use futures_core::Stream;
 
 use crate::{
     buf::{Slice, SliceMut},
@@ -17,6 +18,10 @@ pub trait MaybeSendFuture: Future + MaybeSend {}
 
 impl<F> MaybeSendFuture for F where F: Future + MaybeSend {}
 
+pub trait MaybeSendStream: Stream + MaybeSend {}
+
+impl<S> MaybeSendStream for S where S: Stream + MaybeSend {}
+
 pub trait DynWrite: MaybeSend {
     //! Dyn compatible(object safety) version of [`Write`].
     //! All implementations of [`Write`] has already implemented this trait.

diff --git a/fusio/src/fs/mod.rs b/fusio/src/fs/mod.rs
@@ -46,7 +46,8 @@ pub trait Fs: MaybeSend + MaybeSync {
     fn list(
         &self,
         path: &Path,
-    ) -> impl Future<Output = Result<impl Stream<Item = Result<FileMeta, Error>>, Error>> + MaybeSend;
+    ) -> impl Future<Output = Result<impl Stream<Item = Result<FileMeta, Error>> + MaybeSend, Error>>
+           + MaybeSend;
 
     fn remove(&self, path: &Path) -> impl Future<Output = Result<(), Error>> + MaybeSend;