You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@opendal.apache.org by xu...@apache.org on 2024/03/13 12:35:37 UTC

(opendal) branch main updated: refactor(core/oio): Migrate `oio::List` to async fn in trait (#4352)

This is an automated email from the ASF dual-hosted git repository.

xuanwo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/opendal.git


The following commit(s) were added to refs/heads/main by this push:
     new 99941ec65d refactor(core/oio): Migrate `oio::List` to async fn in trait (#4352)
99941ec65d is described below

commit 99941ec65d1052c9e258615f32d5483216749f26
Author: Xuanwo <gi...@xuanwo.io>
AuthorDate: Wed Mar 13 20:35:29 2024 +0800

    refactor(core/oio): Migrate `oio::List` to async fn in trait (#4352)
    
    * Build passed
    
    Signed-off-by: Xuanwo <gi...@xuanwo.io>
    
    * Fix check
    
    Signed-off-by: Xuanwo <gi...@xuanwo.io>
    
    * Fix check
    
    Signed-off-by: Xuanwo <gi...@xuanwo.io>
    
    * Fix
    
    Signed-off-by: Xuanwo <gi...@xuanwo.io>
    
    * Format code
    
    Signed-off-by: Xuanwo <gi...@xuanwo.io>
    
    * Fix wasm
    
    Signed-off-by: Xuanwo <gi...@xuanwo.io>
    
    * FIx
    
    Signed-off-by: Xuanwo <gi...@xuanwo.io>
    
    * Fix list
    
    Signed-off-by: Xuanwo <gi...@xuanwo.io>
    
    * Fix tests
    
    Signed-off-by: Xuanwo <gi...@xuanwo.io>
    
    ---------
    
    Signed-off-by: Xuanwo <gi...@xuanwo.io>
---
 core/src/layers/blocking.rs               |  2 +-
 core/src/layers/complete.rs               |  2 +-
 core/src/layers/concurrent_limit.rs       |  5 +-
 core/src/layers/error_context.rs          |  6 +--
 core/src/layers/immutable_index.rs        |  7 ++-
 core/src/layers/logging.rs                |  9 ++--
 core/src/layers/madsim.rs                 |  7 +--
 core/src/layers/minitrace.rs              |  8 +--
 core/src/layers/oteltrace.rs              |  6 +--
 core/src/layers/retry.rs                  | 79 +++++++++++-----------------
 core/src/layers/timeout.rs                | 19 +++----
 core/src/layers/tracing.rs                |  5 +-
 core/src/raw/adapters/kv/backend.rs       |  4 +-
 core/src/raw/adapters/typed_kv/backend.rs |  4 +-
 core/src/raw/enum_utils.rs                | 10 ++--
 core/src/raw/oio/list/api.rs              | 67 ++++++++++--------------
 core/src/raw/oio/list/flat_list.rs        | 47 ++++-------------
 core/src/raw/oio/list/hierarchy_list.rs   | 13 ++---
 core/src/raw/oio/list/mod.rs              |  1 -
 core/src/raw/oio/list/page_list.rs        | 77 ++++++++-------------------
 core/src/raw/oio/list/prefix_list.rs      | 10 ++--
 core/src/services/alluxio/lister.rs       |  3 --
 core/src/services/azblob/lister.rs        |  3 --
 core/src/services/azdls/lister.rs         |  2 -
 core/src/services/azfile/lister.rs        |  2 -
 core/src/services/b2/lister.rs            |  2 -
 core/src/services/chainsafe/lister.rs     |  2 -
 core/src/services/cos/lister.rs           |  2 -
 core/src/services/dbfs/lister.rs          |  2 -
 core/src/services/fs/lister.rs            | 86 +++++++++----------------------
 core/src/services/ftp/lister.rs           |  9 ++--
 core/src/services/gcs/lister.rs           |  3 --
 core/src/services/gdrive/lister.rs        |  3 --
 core/src/services/github/lister.rs        |  3 --
 core/src/services/hdfs/lister.rs          | 12 ++---
 core/src/services/hdfs_native/lister.rs   |  4 +-
 core/src/services/huggingface/lister.rs   |  3 --
 core/src/services/ipfs/backend.rs         |  1 -
 core/src/services/ipmfs/lister.rs         |  2 -
 core/src/services/koofr/lister.rs         |  3 --
 core/src/services/obs/lister.rs           |  2 -
 core/src/services/onedrive/lister.rs      |  3 --
 core/src/services/oss/lister.rs           |  2 -
 core/src/services/pcloud/lister.rs        |  2 -
 core/src/services/s3/lister.rs            |  3 --
 core/src/services/seafile/lister.rs       |  6 +--
 core/src/services/sftp/lister.rs          | 33 ++++++------
 core/src/services/swift/lister.rs         |  3 --
 core/src/services/upyun/lister.rs         |  3 --
 core/src/services/vercel_blob/lister.rs   |  3 --
 core/src/services/webdav/lister.rs        |  2 -
 core/src/services/webhdfs/lister.rs       |  2 -
 core/src/services/yandex_disk/lister.rs   |  3 --
 core/src/types/list.rs                    | 67 +++++++++++++++---------
 54 files changed, 234 insertions(+), 435 deletions(-)

diff --git a/core/src/layers/blocking.rs b/core/src/layers/blocking.rs
index 84a0c12292..529ce6bf66 100644
--- a/core/src/layers/blocking.rs
+++ b/core/src/layers/blocking.rs
@@ -311,7 +311,7 @@ impl<I: oio::Write + 'static> oio::BlockingWrite for BlockingWrapper<I> {
 
 impl<I: oio::List> oio::BlockingList for BlockingWrapper<I> {
     fn next(&mut self) -> Result<Option<oio::Entry>> {
-        self.handle.block_on(poll_fn(|cx| self.inner.poll_next(cx)))
+        self.handle.block_on(self.inner.next())
     }
 }
 
diff --git a/core/src/layers/complete.rs b/core/src/layers/complete.rs
index 60dd2d2673..405210d320 100644
--- a/core/src/layers/complete.rs
+++ b/core/src/layers/complete.rs
@@ -212,7 +212,7 @@ impl<A: Accessor> CompleteAccessor<A> {
                 )
                 .await?;
 
-            return if oio::ListExt::next(&mut l).await?.is_some() {
+            return if oio::List::next(&mut l).await?.is_some() {
                 Ok(RpStat::new(Metadata::new(EntryMode::DIR)))
             } else {
                 Err(Error::new(
diff --git a/core/src/layers/concurrent_limit.rs b/core/src/layers/concurrent_limit.rs
index 8a663cfc47..f3b1f95e83 100644
--- a/core/src/layers/concurrent_limit.rs
+++ b/core/src/layers/concurrent_limit.rs
@@ -16,6 +16,7 @@
 // under the License.
 
 use std::fmt::Debug;
+
 use std::io::SeekFrom;
 use std::sync::Arc;
 use std::task::Context;
@@ -301,8 +302,8 @@ impl<R: oio::BlockingWrite> oio::BlockingWrite for ConcurrentLimitWrapper<R> {
 }
 
 impl<R: oio::List> oio::List for ConcurrentLimitWrapper<R> {
-    fn poll_next(&mut self, cx: &mut Context<'_>) -> Poll<Result<Option<oio::Entry>>> {
-        self.inner.poll_next(cx)
+    async fn next(&mut self) -> Result<Option<oio::Entry>> {
+        self.inner.next().await
     }
 }
 
diff --git a/core/src/layers/error_context.rs b/core/src/layers/error_context.rs
index f8112951a1..52db9359e9 100644
--- a/core/src/layers/error_context.rs
+++ b/core/src/layers/error_context.rs
@@ -17,6 +17,7 @@
 
 use std::fmt::Debug;
 use std::fmt::Formatter;
+
 use std::io::SeekFrom;
 use std::task::Context;
 use std::task::Poll;
@@ -433,10 +434,9 @@ impl<T: oio::BlockingWrite> oio::BlockingWrite for ErrorContextWrapper<T> {
     }
 }
 
-#[async_trait::async_trait]
 impl<T: oio::List> oio::List for ErrorContextWrapper<T> {
-    fn poll_next(&mut self, cx: &mut Context<'_>) -> Poll<Result<Option<oio::Entry>>> {
-        self.inner.poll_next(cx).map_err(|err| {
+    async fn next(&mut self) -> Result<Option<oio::Entry>> {
+        self.inner.next().await.map_err(|err| {
             err.with_operation(ListOperation::Next)
                 .with_context("service", self.scheme)
                 .with_context("path", &self.path)
diff --git a/core/src/layers/immutable_index.rs b/core/src/layers/immutable_index.rs
index eea8a343c1..a6eb054063 100644
--- a/core/src/layers/immutable_index.rs
+++ b/core/src/layers/immutable_index.rs
@@ -17,8 +17,7 @@
 
 use std::collections::HashSet;
 use std::fmt::Debug;
-use std::task::Context;
-use std::task::Poll;
+
 use std::vec::IntoIter;
 
 use async_trait::async_trait;
@@ -233,8 +232,8 @@ impl ImmutableDir {
 }
 
 impl oio::List for ImmutableDir {
-    fn poll_next(&mut self, _: &mut Context<'_>) -> Poll<Result<Option<oio::Entry>>> {
-        Poll::Ready(Ok(self.inner_next()))
+    async fn next(&mut self) -> Result<Option<oio::Entry>> {
+        Ok(self.inner_next())
     }
 }
 
diff --git a/core/src/layers/logging.rs b/core/src/layers/logging.rs
index 02abb3f3df..432469fcc3 100644
--- a/core/src/layers/logging.rs
+++ b/core/src/layers/logging.rs
@@ -16,6 +16,7 @@
 // under the License.
 
 use std::fmt::Debug;
+
 use std::io;
 use std::task::ready;
 use std::task::Context;
@@ -1353,11 +1354,9 @@ impl<P> Drop for LoggingLister<P> {
     }
 }
 
-#[cfg_attr(not(target_arch = "wasm32"), async_trait)]
-#[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
 impl<P: oio::List> oio::List for LoggingLister<P> {
-    fn poll_next(&mut self, cx: &mut Context<'_>) -> Poll<Result<Option<oio::Entry>>> {
-        let res = ready!(self.inner.poll_next(cx));
+    async fn next(&mut self) -> Result<Option<oio::Entry>> {
+        let res = self.inner.next().await;
 
         match &res {
             Ok(Some(de)) => {
@@ -1395,7 +1394,7 @@ impl<P: oio::List> oio::List for LoggingLister<P> {
             }
         };
 
-        Poll::Ready(res)
+        res
     }
 }
 
diff --git a/core/src/layers/madsim.rs b/core/src/layers/madsim.rs
index d4135251a3..c2efde340b 100644
--- a/core/src/layers/madsim.rs
+++ b/core/src/layers/madsim.rs
@@ -25,6 +25,7 @@ use std::any::Any;
 use std::cmp::min;
 use std::collections::HashMap;
 use std::fmt::Debug;
+use std::future::Future;
 use std::io::Result;
 use std::io::SeekFrom;
 use std::net::SocketAddr;
@@ -325,11 +326,11 @@ impl oio::Write for MadsimWriter {
 pub struct MadsimLister {}
 
 impl oio::List for MadsimLister {
-    fn poll_next(&mut self, cx: &mut Context<'_>) -> Poll<crate::Result<Option<oio::Entry>>> {
-        Poll::Ready(Err(Error::new(
+    async fn next(&mut self) -> crate::Result<Option<oio::Entry>> {
+        Err(Error::new(
             ErrorKind::Unsupported,
             "will be supported in the future",
-        )))
+        ))
     }
 }
 
diff --git a/core/src/layers/minitrace.rs b/core/src/layers/minitrace.rs
index fdc6a1dc92..2f3962b48c 100644
--- a/core/src/layers/minitrace.rs
+++ b/core/src/layers/minitrace.rs
@@ -16,6 +16,7 @@
 // under the License.
 
 use std::fmt::Debug;
+
 use std::io;
 use std::task::Context;
 use std::task::Poll;
@@ -357,10 +358,9 @@ impl<R: oio::BlockingWrite> oio::BlockingWrite for MinitraceWrapper<R> {
 }
 
 impl<R: oio::List> oio::List for MinitraceWrapper<R> {
-    fn poll_next(&mut self, cx: &mut Context<'_>) -> Poll<Result<Option<oio::Entry>>> {
-        let _g = self.span.set_local_parent();
-        let _span = LocalSpan::enter_with_local_parent(ListOperation::Next.into_static());
-        self.inner.poll_next(cx)
+    #[trace(enter_on_poll = true)]
+    async fn next(&mut self) -> Result<Option<oio::Entry>> {
+        self.inner.next().await
     }
 }
 
diff --git a/core/src/layers/oteltrace.rs b/core/src/layers/oteltrace.rs
index 90e8d65392..d582691f11 100644
--- a/core/src/layers/oteltrace.rs
+++ b/core/src/layers/oteltrace.rs
@@ -321,11 +321,9 @@ impl<R: oio::BlockingWrite> oio::BlockingWrite for OtelTraceWrapper<R> {
     }
 }
 
-#[cfg_attr(not(target_arch = "wasm32"), async_trait)]
-#[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
 impl<R: oio::List> oio::List for OtelTraceWrapper<R> {
-    fn poll_next(&mut self, cx: &mut Context<'_>) -> Poll<Result<Option<oio::Entry>>> {
-        self.inner.poll_next(cx)
+    async fn next(&mut self) -> Result<Option<oio::Entry>> {
+        self.inner.next().await
     }
 }
 
diff --git a/core/src/layers/retry.rs b/core/src/layers/retry.rs
index e6582114e8..8abab3b2ff 100644
--- a/core/src/layers/retry.rs
+++ b/core/src/layers/retry.rs
@@ -17,6 +17,7 @@
 
 use std::fmt::Debug;
 use std::fmt::Formatter;
+
 use std::io;
 use std::pin::Pin;
 use std::sync::Arc;
@@ -952,53 +953,37 @@ impl<R: oio::BlockingWrite, I: RetryInterceptor> oio::BlockingWrite for RetryWra
     }
 }
 
-#[cfg_attr(not(target_arch = "wasm32"), async_trait)]
-#[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
 impl<P: oio::List, I: RetryInterceptor> oio::List for RetryWrapper<P, I> {
-    fn poll_next(&mut self, cx: &mut Context<'_>) -> Poll<Result<Option<oio::Entry>>> {
-        if let Some(sleep) = self.sleep.as_mut() {
-            ready!(sleep.poll_unpin(cx));
-            self.sleep = None;
-        }
+    async fn next(&mut self) -> Result<Option<oio::Entry>> {
+        use backon::RetryableWithContext;
 
-        match ready!(self.inner.as_mut().unwrap().poll_next(cx)) {
-            Ok(v) => {
-                self.current_backoff = None;
-                Poll::Ready(Ok(v))
-            }
-            Err(err) if !err.is_temporary() => {
-                self.current_backoff = None;
-                Poll::Ready(Err(err))
-            }
-            Err(err) => {
-                let backoff = match self.current_backoff.as_mut() {
-                    Some(backoff) => backoff,
-                    None => {
-                        self.current_backoff = Some(self.builder.build());
-                        self.current_backoff.as_mut().unwrap()
-                    }
-                };
+        let inner = self.inner.take().expect("inner must be valid");
 
-                match backoff.next() {
-                    None => {
-                        self.current_backoff = None;
-                        Poll::Ready(Err(err))
-                    }
-                    Some(dur) => {
-                        self.notify.intercept(
-                            &err,
-                            dur,
-                            &[
-                                ("operation", ListOperation::Next.into_static()),
-                                ("path", &self.path),
-                            ],
-                        );
-                        self.sleep = Some(Box::pin(tokio::time::sleep(dur)));
-                        self.poll_next(cx)
-                    }
-                }
+        let (inner, res) = {
+            |mut p: P| async move {
+                let res = p.next().await;
+
+                (p, res)
             }
         }
+        .retry(&self.builder)
+        .when(|e| e.is_temporary())
+        .context(inner)
+        .notify(|err, dur| {
+            self.notify.intercept(
+                err,
+                dur,
+                &[
+                    ("operation", ListOperation::Next.into_static()),
+                    ("path", &self.path),
+                ],
+            )
+        })
+        .map(|(r, res)| (r, res.map_err(|err| err.set_persistent())))
+        .await;
+
+        self.inner = Some(inner);
+        res
     }
 }
 
@@ -1028,8 +1013,6 @@ mod tests {
     use std::io;
     use std::sync::Arc;
     use std::sync::Mutex;
-    use std::task::Context;
-    use std::task::Poll;
 
     use async_trait::async_trait;
     use bytes::Bytes;
@@ -1208,9 +1191,9 @@ mod tests {
     }
 
     impl oio::List for MockLister {
-        fn poll_next(&mut self, _: &mut Context<'_>) -> Poll<Result<Option<oio::Entry>>> {
+        async fn next(&mut self) -> Result<Option<oio::Entry>> {
             self.attempt += 1;
-            let result = match self.attempt {
+            match self.attempt {
                 1 => Err(Error::new(
                     ErrorKind::RateLimited,
                     "retryable rate limited error from lister",
@@ -1240,9 +1223,7 @@ mod tests {
                 _ => {
                     unreachable!()
                 }
-            };
-
-            Poll::Ready(result)
+            }
         }
     }
 
diff --git a/core/src/layers/timeout.rs b/core/src/layers/timeout.rs
index f80d29cf1b..d522571364 100644
--- a/core/src/layers/timeout.rs
+++ b/core/src/layers/timeout.rs
@@ -360,12 +360,9 @@ impl<R: oio::Write> oio::Write for TimeoutWrapper<R> {
 }
 
 impl<R: oio::List> oio::List for TimeoutWrapper<R> {
-    fn poll_next(&mut self, cx: &mut Context<'_>) -> Poll<Result<Option<oio::Entry>>> {
-        self.poll_timeout(cx, ListOperation::Next.into_static())?;
-
-        let v = ready!(self.inner.poll_next(cx));
-        self.sleep = None;
-        Poll::Ready(v)
+    async fn next(&mut self) -> Result<Option<oio::Entry>> {
+        let fut = self.inner.next();
+        Self::io_timeout(self.timeout, ListOperation::Next.into_static(), fut).await
     }
 }
 
@@ -374,8 +371,7 @@ mod tests {
     use std::future::{pending, Future};
     use std::io::SeekFrom;
     use std::sync::Arc;
-    use std::task::Context;
-    use std::task::Poll;
+
     use std::time::Duration;
 
     use async_trait::async_trait;
@@ -447,8 +443,8 @@ mod tests {
     struct MockLister;
 
     impl oio::List for MockLister {
-        fn poll_next(&mut self, _: &mut Context<'_>) -> Poll<Result<Option<oio::Entry>>> {
-            Poll::Pending
+        fn next(&mut self) -> impl Future<Output = Result<Option<oio::Entry>>> {
+            pending()
         }
     }
 
@@ -506,6 +502,8 @@ mod tests {
 
     #[tokio::test]
     async fn test_list_timeout_raw() {
+        use oio::List;
+
         let acc = MockService;
         let timeout_layer = TimeoutLayer::new()
             .with_timeout(Duration::from_secs(1))
@@ -516,7 +514,6 @@ mod tests {
             .await
             .unwrap();
 
-        use oio::ListExt;
         let res = lister.next().await;
         assert!(res.is_err());
         let err = res.unwrap_err();
diff --git a/core/src/layers/tracing.rs b/core/src/layers/tracing.rs
index 017264cd32..e172e78db7 100644
--- a/core/src/layers/tracing.rs
+++ b/core/src/layers/tracing.rs
@@ -16,6 +16,7 @@
 // under the License.
 
 use std::fmt::Debug;
+
 use std::io;
 use std::task::Context;
 use std::task::Poll;
@@ -349,8 +350,8 @@ impl<R: oio::BlockingWrite> oio::BlockingWrite for TracingWrapper<R> {
 
 impl<R: oio::List> oio::List for TracingWrapper<R> {
     #[tracing::instrument(parent = &self.span, level = "debug", skip_all)]
-    fn poll_next(&mut self, cx: &mut Context<'_>) -> Poll<Result<Option<oio::Entry>>> {
-        self.inner.poll_next(cx)
+    async fn next(&mut self) -> Result<Option<oio::Entry>> {
+        self.inner.next().await
     }
 }
 
diff --git a/core/src/raw/adapters/kv/backend.rs b/core/src/raw/adapters/kv/backend.rs
index 2f1c82da8a..c3d840fa51 100644
--- a/core/src/raw/adapters/kv/backend.rs
+++ b/core/src/raw/adapters/kv/backend.rs
@@ -249,8 +249,8 @@ impl KvLister {
 }
 
 impl oio::List for KvLister {
-    fn poll_next(&mut self, _: &mut Context<'_>) -> Poll<Result<Option<oio::Entry>>> {
-        Poll::Ready(Ok(self.inner_next()))
+    async fn next(&mut self) -> Result<Option<oio::Entry>> {
+        Ok(self.inner_next())
     }
 }
 
diff --git a/core/src/raw/adapters/typed_kv/backend.rs b/core/src/raw/adapters/typed_kv/backend.rs
index 8f56a06116..41bf51155c 100644
--- a/core/src/raw/adapters/typed_kv/backend.rs
+++ b/core/src/raw/adapters/typed_kv/backend.rs
@@ -253,8 +253,8 @@ impl KvLister {
 }
 
 impl oio::List for KvLister {
-    fn poll_next(&mut self, _: &mut Context<'_>) -> Poll<Result<Option<oio::Entry>>> {
-        Poll::Ready(Ok(self.inner_next()))
+    async fn next(&mut self) -> Result<Option<oio::Entry>> {
+        Ok(self.inner_next())
     }
 }
 
diff --git a/core/src/raw/enum_utils.rs b/core/src/raw/enum_utils.rs
index 430e513774..13890a5bb9 100644
--- a/core/src/raw/enum_utils.rs
+++ b/core/src/raw/enum_utils.rs
@@ -263,12 +263,12 @@ where
     THREE: oio::List,
     FOUR: oio::List,
 {
-    fn poll_next(&mut self, cx: &mut Context<'_>) -> Poll<Result<Option<oio::Entry>>> {
+    async fn next(&mut self) -> Result<Option<oio::Entry>> {
         match self {
-            Self::One(v) => v.poll_next(cx),
-            Self::Two(v) => v.poll_next(cx),
-            Self::Three(v) => v.poll_next(cx),
-            Self::Four(v) => v.poll_next(cx),
+            Self::One(v) => v.next().await,
+            Self::Two(v) => v.next().await,
+            Self::Three(v) => v.next().await,
+            Self::Four(v) => v.next().await,
         }
     }
 }
diff --git a/core/src/raw/oio/list/api.rs b/core/src/raw/oio/list/api.rs
index 07dbdf774b..e5c62054cd 100644
--- a/core/src/raw/oio/list/api.rs
+++ b/core/src/raw/oio/list/api.rs
@@ -18,18 +18,18 @@
 use std::fmt::Display;
 use std::fmt::Formatter;
 use std::future::Future;
-use std::pin::Pin;
-use std::task::Context;
-use std::task::Poll;
+
+use std::ops::DerefMut;
 
 use crate::raw::oio::Entry;
+use crate::raw::BoxedFuture;
 use crate::*;
 
 /// PageOperation is the name for APIs of lister.
 #[derive(Debug, Copy, Clone, Hash, Eq, PartialEq)]
 #[non_exhaustive]
 pub enum ListOperation {
-    /// Operation for [`List::poll_next`]
+    /// Operation for [`List::next`]
     Next,
     /// Operation for [`BlockingList::next`]
     BlockingNext,
@@ -59,67 +59,54 @@ impl From<ListOperation> for &'static str {
     }
 }
 
+/// The boxed version of [`List`]
+pub type Lister = Box<dyn ListDyn>;
+
 /// Page trait is used by [`raw::Accessor`] to implement `list` operation.
-pub trait List: Unpin + Send + Sync + 'static {
+pub trait List: Unpin + Send + Sync {
     /// Fetch a new page of [`Entry`]
     ///
     /// `Ok(None)` means all pages have been returned. Any following call
     /// to `next` will always get the same result.
-    fn poll_next(&mut self, cx: &mut Context<'_>) -> Poll<Result<Option<Entry>>>;
-}
-
-/// The boxed version of [`List`]
-pub type Lister = Box<dyn List>;
-
-impl<P: List + ?Sized> List for Box<P> {
-    fn poll_next(&mut self, cx: &mut Context<'_>) -> Poll<Result<Option<Entry>>> {
-        (**self).poll_next(cx)
-    }
+    #[cfg(not(target_arch = "wasm32"))]
+    fn next(&mut self) -> impl Future<Output = Result<Option<Entry>>> + Send;
+    #[cfg(target_arch = "wasm32")]
+    fn next(&mut self) -> impl Future<Output = Result<Option<Entry>>>;
 }
 
 impl List for () {
-    fn poll_next(&mut self, _: &mut Context<'_>) -> Poll<Result<Option<Entry>>> {
-        Poll::Ready(Ok(None))
+    async fn next(&mut self) -> Result<Option<Entry>> {
+        Ok(None)
     }
 }
 
 impl<P: List> List for Option<P> {
-    fn poll_next(&mut self, cx: &mut Context<'_>) -> Poll<Result<Option<Entry>>> {
+    async fn next(&mut self) -> Result<Option<Entry>> {
         match self {
-            Some(p) => p.poll_next(cx),
-            None => Poll::Ready(Ok(None)),
+            Some(p) => p.next().await,
+            None => Ok(None),
         }
     }
 }
 
-/// Impl ListExt for all T: List
-impl<T: List> ListExt for T {}
-
-/// Extension of [`List`] to make it easier for use.
-pub trait ListExt: List {
-    /// Build a future for `poll_next`.
-    fn next(&mut self) -> NextFuture<Self> {
-        NextFuture { lister: self }
-    }
+pub trait ListDyn: Unpin + Send + Sync {
+    fn next_dyn(&mut self) -> BoxedFuture<Result<Option<Entry>>>;
 }
 
-pub struct NextFuture<'a, L: List + Unpin + ?Sized> {
-    lister: &'a mut L,
+impl<T: List + ?Sized> ListDyn for T {
+    fn next_dyn(&mut self) -> BoxedFuture<Result<Option<Entry>>> {
+        Box::pin(self.next())
+    }
 }
 
-impl<L> Future for NextFuture<'_, L>
-where
-    L: List + Unpin + ?Sized,
-{
-    type Output = Result<Option<Entry>>;
-
-    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<Option<Entry>>> {
-        self.lister.poll_next(cx)
+impl<T: ListDyn + ?Sized> List for Box<T> {
+    async fn next(&mut self) -> Result<Option<Entry>> {
+        self.deref_mut().next_dyn().await
     }
 }
 
 /// BlockingList is the blocking version of [`List`].
-pub trait BlockingList: Send + 'static {
+pub trait BlockingList: Send {
     /// Fetch a new page of [`Entry`]
     ///
     /// `Ok(None)` means all pages have been returned. Any following call
diff --git a/core/src/raw/oio/list/flat_list.rs b/core/src/raw/oio/list/flat_list.rs
index 2b948408c1..11ff40380f 100644
--- a/core/src/raw/oio/list/flat_list.rs
+++ b/core/src/raw/oio/list/flat_list.rs
@@ -15,18 +15,9 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use std::task::ready;
-use std::task::Context;
-use std::task::Poll;
-
-use futures::FutureExt;
-
 use crate::raw::*;
 use crate::*;
 
-/// ListFuture is the future returned while calling async list.
-type ListFuture<A, L> = BoxedStaticFuture<(A, oio::Entry, Result<(RpList, L)>)>;
-
 /// FlatLister will walk dir in bottom up way:
 ///
 /// - List nested dir first
@@ -64,12 +55,11 @@ type ListFuture<A, L> = BoxedStaticFuture<(A, oio::Entry, Result<(RpList, L)>)>;
 /// may output parent dirs' files before nested dirs, this is expected because files
 /// always output directly while listing.
 pub struct FlatLister<A: Accessor, L> {
-    acc: Option<A>,
+    acc: A,
     root: String,
 
     next_dir: Option<oio::Entry>,
     active_lister: Vec<(Option<oio::Entry>, L)>,
-    list_future: Option<ListFuture<A, L>>,
 }
 
 /// # Safety
@@ -88,11 +78,10 @@ where
     /// Create a new flat lister
     pub fn new(acc: A, path: &str) -> FlatLister<A, L> {
         FlatLister {
-            acc: Some(acc),
+            acc,
             root: path.to_string(),
             next_dir: Some(oio::Entry::new(path, Metadata::new(EntryMode::DIR))),
             active_lister: vec![],
-            list_future: None,
         }
     }
 }
@@ -102,44 +91,30 @@ where
     A: Accessor<Lister = L>,
     L: oio::List,
 {
-    fn poll_next(&mut self, cx: &mut Context<'_>) -> Poll<Result<Option<oio::Entry>>> {
+    async fn next(&mut self) -> Result<Option<oio::Entry>> {
         loop {
-            if let Some(fut) = self.list_future.as_mut() {
-                let (acc, de, res) = ready!(fut.poll_unpin(cx));
-                self.acc = Some(acc);
-                self.list_future = None;
-
-                let (_, l) = res?;
-                self.active_lister.push((Some(de), l))
-            }
-
             if let Some(de) = self.next_dir.take() {
-                let acc = self.acc.take().expect("Accessor must be valid");
-                let fut = async move {
-                    let res = acc.list(de.path(), OpList::new()).await;
-                    (acc, de, res)
-                };
-                self.list_future = Some(Box::pin(fut));
-                continue;
+                let (_, l) = self.acc.list(de.path(), OpList::new()).await?;
+                self.active_lister.push((Some(de), l));
             }
 
             let (de, lister) = match self.active_lister.last_mut() {
                 Some((de, lister)) => (de, lister),
-                None => return Poll::Ready(Ok(None)),
+                None => return Ok(None),
             };
 
-            match ready!(lister.poll_next(cx))? {
+            match lister.next().await? {
                 Some(v) if v.mode().is_dir() => {
                     self.next_dir = Some(v);
                     continue;
                 }
-                Some(v) => return Poll::Ready(Ok(Some(v))),
+                Some(v) => return Ok(Some(v)),
                 None => {
                     match de.take() {
                         Some(de) => {
                             // Only push entry if it's not root dir
                             if de.path() != self.root {
-                                return Poll::Ready(Ok(Some(de)));
+                                return Ok(Some(de));
                             }
                             continue;
                         }
@@ -162,10 +137,8 @@ where
     fn next(&mut self) -> Result<Option<oio::Entry>> {
         loop {
             if let Some(de) = self.next_dir.take() {
-                let acc = self.acc.take().expect("Accessor must be valid");
-                let (_, l) = acc.blocking_list(de.path(), OpList::new())?;
+                let (_, l) = self.acc.blocking_list(de.path(), OpList::new())?;
 
-                self.acc = Some(acc);
                 self.active_lister.push((Some(de), l))
             }
 
diff --git a/core/src/raw/oio/list/hierarchy_list.rs b/core/src/raw/oio/list/hierarchy_list.rs
index 259e455322..bed486ce74 100644
--- a/core/src/raw/oio/list/hierarchy_list.rs
+++ b/core/src/raw/oio/list/hierarchy_list.rs
@@ -16,9 +16,6 @@
 // under the License.
 
 use std::collections::HashSet;
-use std::task::ready;
-use std::task::Context;
-use std::task::Poll;
 
 use crate::raw::*;
 use crate::*;
@@ -125,18 +122,18 @@ impl<P> HierarchyLister<P> {
 }
 
 impl<P: oio::List> oio::List for HierarchyLister<P> {
-    fn poll_next(&mut self, cx: &mut Context<'_>) -> Poll<Result<Option<oio::Entry>>> {
+    async fn next(&mut self) -> Result<Option<oio::Entry>> {
         loop {
-            let mut entry = match ready!(self.lister.poll_next(cx))? {
+            let mut entry = match self.lister.next().await? {
                 Some(entry) => entry,
-                None => return Poll::Ready(Ok(None)),
+                None => return Ok(None),
             };
 
             if self.recursive {
-                return Poll::Ready(Ok(Some(entry)));
+                return Ok(Some(entry));
             }
             if self.keep_entry(&mut entry) {
-                return Poll::Ready(Ok(Some(entry)));
+                return Ok(Some(entry));
             }
         }
     }
diff --git a/core/src/raw/oio/list/mod.rs b/core/src/raw/oio/list/mod.rs
index 31f70d6f23..8460afb1a2 100644
--- a/core/src/raw/oio/list/mod.rs
+++ b/core/src/raw/oio/list/mod.rs
@@ -19,7 +19,6 @@ mod api;
 pub use api::BlockingList;
 pub use api::BlockingLister;
 pub use api::List;
-pub use api::ListExt;
 pub use api::ListOperation;
 pub use api::Lister;
 
diff --git a/core/src/raw/oio/list/page_list.rs b/core/src/raw/oio/list/page_list.rs
index b793a6b63f..2ed43bdd42 100644
--- a/core/src/raw/oio/list/page_list.rs
+++ b/core/src/raw/oio/list/page_list.rs
@@ -16,11 +16,7 @@
 // under the License.
 
 use std::collections::VecDeque;
-use std::task::ready;
-use std::task::Context;
-use std::task::Poll;
-
-use async_trait::async_trait;
+use std::future::Future;
 
 use crate::raw::*;
 use crate::*;
@@ -35,11 +31,12 @@ use crate::*;
 /// - Services impl `PageList`
 /// - `PageLister` impl `List`
 /// - Expose `PageLister` as `Accessor::Lister`
-#[cfg_attr(not(target_arch = "wasm32"), async_trait)]
-#[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
 pub trait PageList: Send + Sync + Unpin + 'static {
     /// next_page is used to fetch next page of entries from underlying storage.
-    async fn next_page(&self, ctx: &mut PageContext) -> Result<()>;
+    #[cfg(not(target_arch = "wasm32"))]
+    fn next_page(&self, ctx: &mut PageContext) -> impl Future<Output = Result<()>> + Send;
+    #[cfg(target_arch = "wasm32")]
+    fn next_page(&self, ctx: &mut PageContext) -> impl Future<Output = Result<()>>;
 }
 
 /// PageContext is the context passing between `PageList`.
@@ -67,23 +64,10 @@ pub struct PageContext {
 
 /// PageLister implements [`List`] based on [`PageList`].
 pub struct PageLister<L: PageList> {
-    state: State<L>,
-}
-
-enum State<L> {
-    Idle(Option<(L, PageContext)>),
-    Fetch(BoxedStaticFuture<((L, PageContext), Result<()>)>),
+    inner: L,
+    ctx: PageContext,
 }
 
-/// # Safety
-///
-/// wasm32 is a special target that we only have one event-loop for this state.
-unsafe impl<L: PageList> Send for State<L> {}
-/// # Safety
-///
-/// We will only take `&mut Self` reference for State.
-unsafe impl<L: PageList> Sync for State<L> {}
-
 impl<L> PageLister<L>
 where
     L: PageList,
@@ -91,14 +75,12 @@ where
     /// Create a new PageLister.
     pub fn new(l: L) -> Self {
         Self {
-            state: State::Idle(Some((
-                l,
-                PageContext {
-                    done: false,
-                    token: "".to_string(),
-                    entries: VecDeque::new(),
-                },
-            ))),
+            inner: l,
+            ctx: PageContext {
+                done: false,
+                token: "".to_string(),
+                entries: VecDeque::new(),
+            },
         }
     }
 }
@@ -107,33 +89,16 @@ impl<L> oio::List for PageLister<L>
 where
     L: PageList,
 {
-    fn poll_next(&mut self, cx: &mut Context<'_>) -> Poll<Result<Option<oio::Entry>>> {
+    async fn next(&mut self) -> Result<Option<oio::Entry>> {
         loop {
-            match &mut self.state {
-                State::Idle(st) => {
-                    if let Some((_, ctx)) = st.as_mut() {
-                        if let Some(entry) = ctx.entries.pop_front() {
-                            return Poll::Ready(Ok(Some(entry)));
-                        }
-                        if ctx.done {
-                            return Poll::Ready(Ok(None));
-                        }
-                    }
-
-                    let (l, mut ctx) = st.take().expect("lister must be valid");
-                    let fut = async move {
-                        let res = l.next_page(&mut ctx).await;
-                        ((l, ctx), res)
-                    };
-                    self.state = State::Fetch(Box::pin(fut));
-                }
-                State::Fetch(fut) => {
-                    let ((l, ctx), res) = ready!(fut.as_mut().poll(cx));
-                    self.state = State::Idle(Some((l, ctx)));
-
-                    res?;
-                }
+            if let Some(entry) = self.ctx.entries.pop_front() {
+                return Ok(Some(entry));
             }
+            if self.ctx.done {
+                return Ok(None);
+            }
+
+            self.inner.next_page(&mut self.ctx).await?;
         }
     }
 }
diff --git a/core/src/raw/oio/list/prefix_list.rs b/core/src/raw/oio/list/prefix_list.rs
index 166dbcaece..e82eee29b1 100644
--- a/core/src/raw/oio/list/prefix_list.rs
+++ b/core/src/raw/oio/list/prefix_list.rs
@@ -15,10 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use std::task::ready;
-use std::task::Context;
-use std::task::Poll;
-
 use crate::raw::*;
 use crate::*;
 
@@ -66,11 +62,11 @@ impl<L> oio::List for PrefixLister<L>
 where
     L: oio::List,
 {
-    fn poll_next(&mut self, cx: &mut Context<'_>) -> Poll<Result<Option<oio::Entry>>> {
+    async fn next(&mut self) -> Result<Option<oio::Entry>> {
         loop {
-            match ready!(self.lister.poll_next(cx)) {
+            match self.lister.next().await {
                 Ok(Some(e)) if !starts_with_not_eq(&e, &self.prefix) => continue,
-                v => return Poll::Ready(v),
+                v => return v,
             }
         }
     }
diff --git a/core/src/services/alluxio/lister.rs b/core/src/services/alluxio/lister.rs
index 5e56dbff89..56463ad4ff 100644
--- a/core/src/services/alluxio/lister.rs
+++ b/core/src/services/alluxio/lister.rs
@@ -17,8 +17,6 @@
 
 use std::sync::Arc;
 
-use async_trait::async_trait;
-
 use super::core::AlluxioCore;
 use crate::raw::oio::Entry;
 use crate::raw::*;
@@ -40,7 +38,6 @@ impl AlluxioLister {
     }
 }
 
-#[async_trait]
 impl oio::PageList for AlluxioLister {
     async fn next_page(&self, ctx: &mut oio::PageContext) -> Result<()> {
         let result = self.core.list_status(&self.path).await;
diff --git a/core/src/services/azblob/lister.rs b/core/src/services/azblob/lister.rs
index eeded04999..6bd1a61243 100644
--- a/core/src/services/azblob/lister.rs
+++ b/core/src/services/azblob/lister.rs
@@ -17,7 +17,6 @@
 
 use std::sync::Arc;
 
-use async_trait::async_trait;
 use bytes::Buf;
 use quick_xml::de;
 
@@ -48,8 +47,6 @@ impl AzblobLister {
     }
 }
 
-#[cfg_attr(not(target_arch = "wasm32"), async_trait)]
-#[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
 impl oio::PageList for AzblobLister {
     async fn next_page(&self, ctx: &mut oio::PageContext) -> Result<()> {
         let resp = self
diff --git a/core/src/services/azdls/lister.rs b/core/src/services/azdls/lister.rs
index db7904f946..3a74b27a58 100644
--- a/core/src/services/azdls/lister.rs
+++ b/core/src/services/azdls/lister.rs
@@ -17,7 +17,6 @@
 
 use std::sync::Arc;
 
-use async_trait::async_trait;
 use serde::Deserialize;
 use serde_json::de;
 
@@ -39,7 +38,6 @@ impl AzdlsLister {
     }
 }
 
-#[async_trait]
 impl oio::PageList for AzdlsLister {
     async fn next_page(&self, ctx: &mut oio::PageContext) -> Result<()> {
         let resp = self
diff --git a/core/src/services/azfile/lister.rs b/core/src/services/azfile/lister.rs
index bb9f8f73b4..9c3e6819c5 100644
--- a/core/src/services/azfile/lister.rs
+++ b/core/src/services/azfile/lister.rs
@@ -17,7 +17,6 @@
 
 use std::sync::Arc;
 
-use async_trait::async_trait;
 use http::StatusCode;
 use quick_xml::de::from_str;
 use serde::Deserialize;
@@ -39,7 +38,6 @@ impl AzfileLister {
     }
 }
 
-#[async_trait]
 impl oio::PageList for AzfileLister {
     async fn next_page(&self, ctx: &mut oio::PageContext) -> Result<()> {
         let resp = self
diff --git a/core/src/services/b2/lister.rs b/core/src/services/b2/lister.rs
index 0dee20a9d1..3d12ec6cf3 100644
--- a/core/src/services/b2/lister.rs
+++ b/core/src/services/b2/lister.rs
@@ -17,7 +17,6 @@
 
 use std::sync::Arc;
 
-use async_trait::async_trait;
 use bytes::Buf;
 
 use super::core::parse_file_info;
@@ -58,7 +57,6 @@ impl B2Lister {
     }
 }
 
-#[async_trait]
 impl oio::PageList for B2Lister {
     async fn next_page(&self, ctx: &mut oio::PageContext) -> Result<()> {
         let resp = self
diff --git a/core/src/services/chainsafe/lister.rs b/core/src/services/chainsafe/lister.rs
index 69cdc55200..faf00b6df7 100644
--- a/core/src/services/chainsafe/lister.rs
+++ b/core/src/services/chainsafe/lister.rs
@@ -17,7 +17,6 @@
 
 use std::sync::Arc;
 
-use async_trait::async_trait;
 use http::StatusCode;
 
 use super::core::parse_info;
@@ -43,7 +42,6 @@ impl ChainsafeLister {
     }
 }
 
-#[async_trait]
 impl oio::PageList for ChainsafeLister {
     async fn next_page(&self, ctx: &mut oio::PageContext) -> Result<()> {
         let resp = self.core.list_objects(&self.path).await?;
diff --git a/core/src/services/cos/lister.rs b/core/src/services/cos/lister.rs
index f289b3383d..098e243d8b 100644
--- a/core/src/services/cos/lister.rs
+++ b/core/src/services/cos/lister.rs
@@ -17,7 +17,6 @@
 
 use std::sync::Arc;
 
-use async_trait::async_trait;
 use bytes::Buf;
 use quick_xml::de;
 
@@ -47,7 +46,6 @@ impl CosLister {
     }
 }
 
-#[async_trait]
 impl oio::PageList for CosLister {
     async fn next_page(&self, ctx: &mut oio::PageContext) -> Result<()> {
         let resp = self
diff --git a/core/src/services/dbfs/lister.rs b/core/src/services/dbfs/lister.rs
index e86dd33810..11841bdae8 100644
--- a/core/src/services/dbfs/lister.rs
+++ b/core/src/services/dbfs/lister.rs
@@ -17,7 +17,6 @@
 
 use std::sync::Arc;
 
-use async_trait::async_trait;
 use http::StatusCode;
 use serde::Deserialize;
 
@@ -37,7 +36,6 @@ impl DbfsLister {
     }
 }
 
-#[async_trait]
 impl oio::PageList for DbfsLister {
     async fn next_page(&self, ctx: &mut oio::PageContext) -> Result<()> {
         let response = self.core.dbfs_list(&self.path).await?;
diff --git a/core/src/services/fs/lister.rs b/core/src/services/fs/lister.rs
index 29ec2c9f36..eec0a4b8aa 100644
--- a/core/src/services/fs/lister.rs
+++ b/core/src/services/fs/lister.rs
@@ -15,15 +15,8 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use std::fs::FileType;
 use std::path::Path;
 use std::path::PathBuf;
-use std::task::ready;
-use std::task::Context;
-use std::task::Poll;
-
-use futures::future::BoxFuture;
-use futures::FutureExt;
 
 use crate::raw::*;
 use crate::EntryMode;
@@ -34,8 +27,6 @@ pub struct FsLister<P> {
     root: PathBuf,
 
     rd: P,
-
-    fut: Option<BoxFuture<'static, (tokio::fs::DirEntry, Result<FileType>)>>,
 }
 
 impl<P> FsLister<P> {
@@ -43,8 +34,6 @@ impl<P> FsLister<P> {
         Self {
             root: root.to_owned(),
             rd,
-
-            fut: None,
         }
     }
 }
@@ -55,57 +44,32 @@ impl<P> FsLister<P> {
 unsafe impl<P> Sync for FsLister<P> {}
 
 impl oio::List for FsLister<tokio::fs::ReadDir> {
-    fn poll_next(&mut self, cx: &mut Context<'_>) -> Poll<Result<Option<oio::Entry>>> {
-        if let Some(fut) = self.fut.as_mut() {
-            let (de, ft) = futures::ready!(fut.poll_unpin(cx));
-            let ft = match ft {
-                Ok(ft) => {
-                    self.fut = None;
-                    ft
-                }
-                Err(e) => {
-                    let fut = async move {
-                        let ft = de.file_type().await.map_err(new_std_io_error);
-                        (de, ft)
-                    };
-                    self.fut = Some(Box::pin(fut));
-                    return Poll::Ready(Err(e));
-                }
-            };
-
-            let entry_path = de.path();
-            let rel_path = normalize_path(
-                &entry_path
-                    .strip_prefix(&self.root)
-                    .expect("cannot fail because the prefix is iterated")
-                    .to_string_lossy()
-                    .replace('\\', "/"),
-            );
-
-            let d = if ft.is_file() {
-                oio::Entry::new(&rel_path, Metadata::new(EntryMode::FILE))
-            } else if ft.is_dir() {
-                // Make sure we are returning the correct path.
-                oio::Entry::new(&format!("{rel_path}/"), Metadata::new(EntryMode::DIR))
-            } else {
-                oio::Entry::new(&rel_path, Metadata::new(EntryMode::Unknown))
-            };
-
-            return Poll::Ready(Ok(Some(d)));
-        }
+    async fn next(&mut self) -> Result<Option<oio::Entry>> {
+        let Some(de) = self.rd.next_entry().await.map_err(new_std_io_error)? else {
+            return Ok(None);
+        };
 
-        let de = ready!(self.rd.poll_next_entry(cx)).map_err(new_std_io_error)?;
-        match de {
-            Some(de) => {
-                let fut = async move {
-                    let ft = de.file_type().await.map_err(new_std_io_error);
-                    (de, ft)
-                };
-                self.fut = Some(Box::pin(fut));
-                self.poll_next(cx)
-            }
-            None => Poll::Ready(Ok(None)),
-        }
+        let ft = de.file_type().await.map_err(new_std_io_error)?;
+
+        let entry_path = de.path();
+        let rel_path = normalize_path(
+            &entry_path
+                .strip_prefix(&self.root)
+                .expect("cannot fail because the prefix is iterated")
+                .to_string_lossy()
+                .replace('\\', "/"),
+        );
+
+        let d = if ft.is_file() {
+            oio::Entry::new(&rel_path, Metadata::new(EntryMode::FILE))
+        } else if ft.is_dir() {
+            // Make sure we are returning the correct path.
+            oio::Entry::new(&format!("{rel_path}/"), Metadata::new(EntryMode::DIR))
+        } else {
+            oio::Entry::new(&rel_path, Metadata::new(EntryMode::Unknown))
+        };
+
+        Ok(Some(d))
     }
 }
 
diff --git a/core/src/services/ftp/lister.rs b/core/src/services/ftp/lister.rs
index 4d77bf1b87..3d531815a2 100644
--- a/core/src/services/ftp/lister.rs
+++ b/core/src/services/ftp/lister.rs
@@ -17,8 +17,7 @@
 
 use std::str;
 use std::str::FromStr;
-use std::task::Context;
-use std::task::Poll;
+
 use std::vec::IntoIter;
 
 use suppaftp::list::File;
@@ -41,12 +40,12 @@ impl FtpLister {
 }
 
 impl oio::List for FtpLister {
-    fn poll_next(&mut self, _: &mut Context<'_>) -> Poll<Result<Option<oio::Entry>>> {
+    async fn next(&mut self) -> Result<Option<oio::Entry>> {
         let de = match self.file_iter.next() {
             Some(file_str) => File::from_str(file_str.as_str()).map_err(|e| {
                 Error::new(ErrorKind::Unexpected, "parse file from response").set_source(e)
             })?,
-            None => return Poll::Ready(Ok(None)),
+            None => return Ok(None),
         };
 
         let path = self.path.to_string() + de.name();
@@ -64,6 +63,6 @@ impl oio::List for FtpLister {
             oio::Entry::new(&path, Metadata::new(EntryMode::Unknown))
         };
 
-        Poll::Ready(Ok(Some(entry)))
+        Ok(Some(entry))
     }
 }
diff --git a/core/src/services/gcs/lister.rs b/core/src/services/gcs/lister.rs
index 0a01801988..f18412c74b 100644
--- a/core/src/services/gcs/lister.rs
+++ b/core/src/services/gcs/lister.rs
@@ -17,7 +17,6 @@
 
 use std::sync::Arc;
 
-use async_trait::async_trait;
 use serde_json;
 
 use super::core::*;
@@ -60,8 +59,6 @@ impl GcsLister {
     }
 }
 
-#[cfg_attr(not(target_arch = "wasm32"), async_trait)]
-#[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
 impl oio::PageList for GcsLister {
     async fn next_page(&self, ctx: &mut oio::PageContext) -> Result<()> {
         let resp = self
diff --git a/core/src/services/gdrive/lister.rs b/core/src/services/gdrive/lister.rs
index db0ad063a6..34df9073f3 100644
--- a/core/src/services/gdrive/lister.rs
+++ b/core/src/services/gdrive/lister.rs
@@ -17,7 +17,6 @@
 
 use std::sync::Arc;
 
-use async_trait::async_trait;
 use http::StatusCode;
 
 use super::core::GdriveCore;
@@ -37,8 +36,6 @@ impl GdriveLister {
     }
 }
 
-#[cfg_attr(not(target_arch = "wasm32"), async_trait)]
-#[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
 impl oio::PageList for GdriveLister {
     async fn next_page(&self, ctx: &mut oio::PageContext) -> Result<()> {
         let file_id = self.core.path_cache.get(&self.path).await?;
diff --git a/core/src/services/github/lister.rs b/core/src/services/github/lister.rs
index 320f664a02..654f3cbb78 100644
--- a/core/src/services/github/lister.rs
+++ b/core/src/services/github/lister.rs
@@ -17,8 +17,6 @@
 
 use std::sync::Arc;
 
-use async_trait::async_trait;
-
 use super::core::GithubCore;
 use crate::raw::oio::Entry;
 use crate::raw::*;
@@ -39,7 +37,6 @@ impl GithubLister {
     }
 }
 
-#[async_trait]
 impl oio::PageList for GithubLister {
     async fn next_page(&self, ctx: &mut oio::PageContext) -> Result<()> {
         let entries = self.core.list(&self.path).await?;
diff --git a/core/src/services/hdfs/lister.rs b/core/src/services/hdfs/lister.rs
index 404d159f5c..8daebbb04f 100644
--- a/core/src/services/hdfs/lister.rs
+++ b/core/src/services/hdfs/lister.rs
@@ -15,11 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use std::task::Context;
-use std::task::Poll;
-
-use async_trait::async_trait;
-
 use crate::raw::*;
 use crate::EntryMode;
 use crate::Metadata;
@@ -41,12 +36,11 @@ impl HdfsLister {
     }
 }
 
-#[async_trait]
 impl oio::List for HdfsLister {
-    fn poll_next(&mut self, _: &mut Context<'_>) -> Poll<Result<Option<oio::Entry>>> {
+    async fn next(&mut self) -> Result<Option<oio::Entry>> {
         let de = match self.rd.next() {
             Some(de) => de,
-            None => return Poll::Ready(Ok(None)),
+            None => return Ok(None),
         };
 
         let path = build_rel_path(&self.root, de.path());
@@ -63,7 +57,7 @@ impl oio::List for HdfsLister {
             oio::Entry::new(&path, Metadata::new(EntryMode::Unknown))
         };
 
-        Poll::Ready(Ok(Some(entry)))
+        Ok(Some(entry))
     }
 }
 
diff --git a/core/src/services/hdfs_native/lister.rs b/core/src/services/hdfs_native/lister.rs
index 65c916c280..bd2863783f 100644
--- a/core/src/services/hdfs_native/lister.rs
+++ b/core/src/services/hdfs_native/lister.rs
@@ -16,8 +16,6 @@
 // under the License.
 
 use std::sync::Arc;
-use std::task::Context;
-use std::task::Poll;
 
 use crate::raw::oio;
 use crate::raw::oio::Entry;
@@ -38,7 +36,7 @@ impl HdfsNativeLister {
 }
 
 impl oio::List for HdfsNativeLister {
-    fn poll_next(&mut self, _cx: &mut Context<'_>) -> Poll<Result<Option<Entry>>> {
+    async fn next(&mut self) -> Result<Option<Entry>> {
         todo!()
     }
 }
diff --git a/core/src/services/huggingface/lister.rs b/core/src/services/huggingface/lister.rs
index e291dd3cdd..836b62481a 100644
--- a/core/src/services/huggingface/lister.rs
+++ b/core/src/services/huggingface/lister.rs
@@ -17,8 +17,6 @@
 
 use std::sync::Arc;
 
-use async_trait::async_trait;
-
 use super::core::HuggingfaceCore;
 use super::core::HuggingfaceStatus;
 use super::error::parse_error;
@@ -41,7 +39,6 @@ impl HuggingfaceLister {
     }
 }
 
-#[async_trait]
 impl oio::PageList for HuggingfaceLister {
     async fn next_page(&self, ctx: &mut oio::PageContext) -> Result<()> {
         let response = self.core.hf_list(&self.path, self.recursive).await?;
diff --git a/core/src/services/ipfs/backend.rs b/core/src/services/ipfs/backend.rs
index 8e990e3138..964a1cef19 100644
--- a/core/src/services/ipfs/backend.rs
+++ b/core/src/services/ipfs/backend.rs
@@ -423,7 +423,6 @@ impl DirStream {
     }
 }
 
-#[async_trait]
 impl oio::PageList for DirStream {
     async fn next_page(&self, ctx: &mut oio::PageContext) -> Result<()> {
         let resp = self.backend.ipfs_list(&self.path).await?;
diff --git a/core/src/services/ipmfs/lister.rs b/core/src/services/ipmfs/lister.rs
index 9198b8e31a..81bff72dca 100644
--- a/core/src/services/ipmfs/lister.rs
+++ b/core/src/services/ipmfs/lister.rs
@@ -17,7 +17,6 @@
 
 use std::sync::Arc;
 
-use async_trait::async_trait;
 use http::StatusCode;
 use serde::Deserialize;
 
@@ -44,7 +43,6 @@ impl IpmfsLister {
     }
 }
 
-#[async_trait]
 impl oio::PageList for IpmfsLister {
     async fn next_page(&self, ctx: &mut oio::PageContext) -> Result<()> {
         let resp = self.backend.ipmfs_ls(&self.path).await?;
diff --git a/core/src/services/koofr/lister.rs b/core/src/services/koofr/lister.rs
index 8ad58a58d2..8d56e65f5b 100644
--- a/core/src/services/koofr/lister.rs
+++ b/core/src/services/koofr/lister.rs
@@ -17,8 +17,6 @@
 
 use std::sync::Arc;
 
-use async_trait::async_trait;
-
 use super::core::KoofrCore;
 use super::core::ListResponse;
 use super::error::parse_error;
@@ -43,7 +41,6 @@ impl KoofrLister {
     }
 }
 
-#[async_trait]
 impl oio::PageList for KoofrLister {
     async fn next_page(&self, ctx: &mut oio::PageContext) -> Result<()> {
         let resp = self.core.list(&self.path).await?;
diff --git a/core/src/services/obs/lister.rs b/core/src/services/obs/lister.rs
index ead6bbbeab..e38ebe7519 100644
--- a/core/src/services/obs/lister.rs
+++ b/core/src/services/obs/lister.rs
@@ -17,7 +17,6 @@
 
 use std::sync::Arc;
 
-use async_trait::async_trait;
 use bytes::Buf;
 use quick_xml::de;
 
@@ -48,7 +47,6 @@ impl ObsLister {
     }
 }
 
-#[async_trait]
 impl oio::PageList for ObsLister {
     async fn next_page(&self, ctx: &mut oio::PageContext) -> Result<()> {
         let resp = self
diff --git a/core/src/services/onedrive/lister.rs b/core/src/services/onedrive/lister.rs
index 12c557867a..32fdc426f7 100644
--- a/core/src/services/onedrive/lister.rs
+++ b/core/src/services/onedrive/lister.rs
@@ -15,8 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use async_trait::async_trait;
-
 use super::backend::OnedriveBackend;
 use super::error::parse_error;
 use super::graph_model::GraphApiOnedriveListResponse;
@@ -43,7 +41,6 @@ impl OnedriveLister {
     }
 }
 
-#[async_trait]
 impl oio::PageList for OnedriveLister {
     async fn next_page(&self, ctx: &mut oio::PageContext) -> Result<()> {
         let request_url = if ctx.token.is_empty() {
diff --git a/core/src/services/oss/lister.rs b/core/src/services/oss/lister.rs
index 926946a616..28919cfa80 100644
--- a/core/src/services/oss/lister.rs
+++ b/core/src/services/oss/lister.rs
@@ -17,7 +17,6 @@
 
 use std::sync::Arc;
 
-use async_trait::async_trait;
 use bytes::Buf;
 use quick_xml::de;
 
@@ -56,7 +55,6 @@ impl OssLister {
     }
 }
 
-#[async_trait]
 impl oio::PageList for OssLister {
     async fn next_page(&self, ctx: &mut oio::PageContext) -> Result<()> {
         let resp = self
diff --git a/core/src/services/pcloud/lister.rs b/core/src/services/pcloud/lister.rs
index e4dd65c381..eb4a0c670b 100644
--- a/core/src/services/pcloud/lister.rs
+++ b/core/src/services/pcloud/lister.rs
@@ -17,7 +17,6 @@
 
 use std::sync::Arc;
 
-use async_trait::async_trait;
 use http::StatusCode;
 
 use super::core::*;
@@ -41,7 +40,6 @@ impl PcloudLister {
     }
 }
 
-#[async_trait]
 impl oio::PageList for PcloudLister {
     async fn next_page(&self, ctx: &mut oio::PageContext) -> Result<()> {
         let resp = self.core.list_folder(&self.path).await?;
diff --git a/core/src/services/s3/lister.rs b/core/src/services/s3/lister.rs
index 569d83ebee..1e1c25b1d7 100644
--- a/core/src/services/s3/lister.rs
+++ b/core/src/services/s3/lister.rs
@@ -17,7 +17,6 @@
 
 use std::sync::Arc;
 
-use async_trait::async_trait;
 use bytes::Buf;
 use quick_xml::de;
 
@@ -60,8 +59,6 @@ impl S3Lister {
     }
 }
 
-#[cfg_attr(not(target_arch = "wasm32"), async_trait)]
-#[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
 impl oio::PageList for S3Lister {
     async fn next_page(&self, ctx: &mut oio::PageContext) -> Result<()> {
         let resp = self
diff --git a/core/src/services/seafile/lister.rs b/core/src/services/seafile/lister.rs
index 792d628032..ff687981ff 100644
--- a/core/src/services/seafile/lister.rs
+++ b/core/src/services/seafile/lister.rs
@@ -17,7 +17,6 @@
 
 use std::sync::Arc;
 
-use async_trait::async_trait;
 use http::header;
 use http::Request;
 use http::StatusCode;
@@ -44,7 +43,6 @@ impl SeafileLister {
     }
 }
 
-#[async_trait]
 impl oio::PageList for SeafileLister {
     async fn next_page(&self, ctx: &mut oio::PageContext) -> Result<()> {
         let path = build_rooted_abs_path(&self.core.root, &self.path);
@@ -103,9 +101,7 @@ impl oio::PageList for SeafileLister {
                 ctx.done = true;
                 Ok(())
             }
-            _ => {
-                return Err(parse_error(resp).await?);
-            }
+            _ => Err(parse_error(resp).await?),
         }
     }
 }
diff --git a/core/src/services/sftp/lister.rs b/core/src/services/sftp/lister.rs
index f7fe5aac9f..077e123ee3 100644
--- a/core/src/services/sftp/lister.rs
+++ b/core/src/services/sftp/lister.rs
@@ -16,17 +16,14 @@
 // under the License.
 
 use std::pin::Pin;
-use std::task::ready;
-use std::task::Context;
-use std::task::Poll;
 
-use async_trait::async_trait;
 use futures::StreamExt;
 use openssh_sftp_client::fs::DirEntry;
 use openssh_sftp_client::fs::ReadDir;
 
 use super::error::parse_sftp_error;
 use crate::raw::oio;
+use crate::raw::oio::Entry;
 use crate::Result;
 
 pub struct SftpLister {
@@ -45,22 +42,26 @@ impl SftpLister {
     }
 }
 
-#[async_trait]
 impl oio::List for SftpLister {
-    fn poll_next(&mut self, cx: &mut Context<'_>) -> Poll<Result<Option<oio::Entry>>> {
-        let item = ready!(self.dir.poll_next_unpin(cx))
-            .transpose()
-            .map_err(parse_sftp_error)?;
+    async fn next(&mut self) -> Result<Option<Entry>> {
+        loop {
+            let item = self
+                .dir
+                .next()
+                .await
+                .transpose()
+                .map_err(parse_sftp_error)?;
 
-        match item {
-            Some(e) => {
-                if e.filename().to_str() == Some(".") || e.filename().to_str() == Some("..") {
-                    self.poll_next(cx)
-                } else {
-                    Poll::Ready(Ok(Some(map_entry(self.prefix.as_str(), e))))
+            match item {
+                Some(e) => {
+                    if e.filename().to_str() == Some(".") || e.filename().to_str() == Some("..") {
+                        continue;
+                    } else {
+                        return Ok(Some(map_entry(self.prefix.as_str(), e)));
+                    }
                 }
+                None => return Ok(None),
             }
-            None => Poll::Ready(Ok(None)),
         }
     }
 }
diff --git a/core/src/services/swift/lister.rs b/core/src/services/swift/lister.rs
index ee90a17537..79b8fdfa6f 100644
--- a/core/src/services/swift/lister.rs
+++ b/core/src/services/swift/lister.rs
@@ -17,8 +17,6 @@
 
 use std::sync::Arc;
 
-use async_trait::async_trait;
-
 use super::core::*;
 use super::error::parse_error;
 use crate::raw::*;
@@ -43,7 +41,6 @@ impl SwiftLister {
     }
 }
 
-#[async_trait]
 impl oio::PageList for SwiftLister {
     async fn next_page(&self, ctx: &mut oio::PageContext) -> Result<()> {
         let response = self
diff --git a/core/src/services/upyun/lister.rs b/core/src/services/upyun/lister.rs
index 4fdd068cef..547facbf75 100644
--- a/core/src/services/upyun/lister.rs
+++ b/core/src/services/upyun/lister.rs
@@ -17,8 +17,6 @@
 
 use std::sync::Arc;
 
-use async_trait::async_trait;
-
 use super::core::ListObjectsResponse;
 use super::core::UpyunCore;
 use super::error::parse_error;
@@ -45,7 +43,6 @@ impl UpyunLister {
     }
 }
 
-#[async_trait]
 impl oio::PageList for UpyunLister {
     async fn next_page(&self, ctx: &mut oio::PageContext) -> Result<()> {
         let resp = self
diff --git a/core/src/services/vercel_blob/lister.rs b/core/src/services/vercel_blob/lister.rs
index e792d8f379..41c7a201f7 100644
--- a/core/src/services/vercel_blob/lister.rs
+++ b/core/src/services/vercel_blob/lister.rs
@@ -17,8 +17,6 @@
 
 use std::sync::Arc;
 
-use async_trait::async_trait;
-
 use super::core::parse_blob;
 use super::core::VercelBlobCore;
 use crate::raw::oio::Entry;
@@ -42,7 +40,6 @@ impl VercelBlobLister {
     }
 }
 
-#[async_trait]
 impl oio::PageList for VercelBlobLister {
     async fn next_page(&self, ctx: &mut oio::PageContext) -> Result<()> {
         let p = build_abs_path(&self.core.root, &self.path);
diff --git a/core/src/services/webdav/lister.rs b/core/src/services/webdav/lister.rs
index ab9d7c6085..f1749d522d 100644
--- a/core/src/services/webdav/lister.rs
+++ b/core/src/services/webdav/lister.rs
@@ -17,7 +17,6 @@
 
 use std::sync::Arc;
 
-use async_trait::async_trait;
 use http::StatusCode;
 
 use super::core::*;
@@ -42,7 +41,6 @@ impl WebdavLister {
     }
 }
 
-#[async_trait]
 impl oio::PageList for WebdavLister {
     async fn next_page(&self, ctx: &mut oio::PageContext) -> Result<()> {
         let resp = self.core.webdav_list(&self.path, &self.args).await?;
diff --git a/core/src/services/webhdfs/lister.rs b/core/src/services/webhdfs/lister.rs
index 4a984bb4c6..cc7db189f2 100644
--- a/core/src/services/webhdfs/lister.rs
+++ b/core/src/services/webhdfs/lister.rs
@@ -15,7 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use async_trait::async_trait;
 use http::StatusCode;
 
 use super::backend::WebhdfsBackend;
@@ -38,7 +37,6 @@ impl WebhdfsLister {
     }
 }
 
-#[async_trait]
 impl oio::PageList for WebhdfsLister {
     async fn next_page(&self, ctx: &mut oio::PageContext) -> Result<()> {
         let file_status = if self.backend.disable_list_batch {
diff --git a/core/src/services/yandex_disk/lister.rs b/core/src/services/yandex_disk/lister.rs
index a116ce53a0..9eaec45357 100644
--- a/core/src/services/yandex_disk/lister.rs
+++ b/core/src/services/yandex_disk/lister.rs
@@ -17,8 +17,6 @@
 
 use std::sync::Arc;
 
-use async_trait::async_trait;
-
 use super::core::parse_info;
 use super::core::MetainformationResponse;
 use super::core::YandexDiskCore;
@@ -44,7 +42,6 @@ impl YandexDiskLister {
     }
 }
 
-#[async_trait]
 impl oio::PageList for YandexDiskLister {
     async fn next_page(&self, ctx: &mut oio::PageContext) -> Result<()> {
         let offset = if ctx.token.is_empty() {
diff --git a/core/src/types/list.rs b/core/src/types/list.rs
index fd0f2485ed..141a13bd70 100644
--- a/core/src/types/list.rs
+++ b/core/src/types/list.rs
@@ -26,7 +26,6 @@ use flagset::FlagSet;
 use futures::Stream;
 use futures::StreamExt;
 
-use crate::raw::oio::List;
 use crate::raw::*;
 use crate::*;
 
@@ -45,7 +44,11 @@ pub struct Lister {
     /// required_metakey is the metakey required by users.
     required_metakey: FlagSet<Metakey>,
 
+    fut: Option<BoxedStaticFuture<(oio::Lister, Result<Option<oio::Entry>>)>>,
+
     /// tasks is used to store tasks that are run in concurrent.
+    ///
+    /// TODO: maybe we should move logic inside?
     tasks: ConcurrentFutures<StatTask>,
     errored: bool,
 }
@@ -134,6 +137,7 @@ impl Lister {
             lister: Some(lister),
             required_metakey,
 
+            fut: None,
             tasks: ConcurrentFutures::new(concurrent),
             errored: false,
         })
@@ -151,31 +155,44 @@ impl Stream for Lister {
 
         // Trying to pull more tasks if there are more space.
         if self.tasks.has_remaining() {
-            if let Some(lister) = self.lister.as_mut() {
-                match lister.poll_next(cx) {
-                    Poll::Pending => {}
-                    Poll::Ready(Ok(Some(oe))) => {
-                        let (path, metadata) = oe.into_entry().into_parts();
-                        if metadata.contains_metakey(self.required_metakey) {
-                            self.tasks
-                                .push_back(StatTask::Known(Some((path, metadata))));
-                        } else {
-                            let acc = self.acc.clone();
-                            let fut = async move {
-                                let res = acc.stat(&path, OpStat::default()).await;
-                                (path, res.map(|rp| rp.into_metadata()))
-                            };
-                            self.tasks.push_back(StatTask::Stating(Box::pin(fut)));
+            // Building future is we have a lister available.
+            if let Some(mut lister) = self.lister.take() {
+                let fut = async move {
+                    let res = lister.next_dyn().await;
+                    (lister, res)
+                };
+                self.fut = Some(Box::pin(fut));
+            }
+
+            if let Some(fut) = self.fut.as_mut() {
+                if let Poll::Ready((lister, entry)) = fut.as_mut().poll(cx) {
+                    self.lister = Some(lister);
+                    self.fut = None;
+
+                    match entry {
+                        Ok(Some(oe)) => {
+                            let (path, metadata) = oe.into_entry().into_parts();
+                            if metadata.contains_metakey(self.required_metakey) {
+                                self.tasks
+                                    .push_back(StatTask::Known(Some((path, metadata))));
+                            } else {
+                                let acc = self.acc.clone();
+                                let fut = async move {
+                                    let res = acc.stat(&path, OpStat::default()).await;
+                                    (path, res.map(|rp| rp.into_metadata()))
+                                };
+                                self.tasks.push_back(StatTask::Stating(Box::pin(fut)));
+                            }
+                        }
+                        Ok(None) => {
+                            self.lister = None;
+                        }
+                        Err(err) => {
+                            self.errored = true;
+                            return Poll::Ready(Some(Err(err)));
                         }
                     }
-                    Poll::Ready(Ok(None)) => {
-                        self.lister = None;
-                    }
-                    Poll::Ready(Err(err)) => {
-                        self.errored = true;
-                        return Poll::Ready(Some(Err(err)));
-                    }
-                };
+                }
             }
         }
 
@@ -185,7 +202,7 @@ impl Stream for Lister {
             return Poll::Ready(Some(Ok(Entry::new(path, metadata))));
         }
 
-        if self.lister.is_some() {
+        if self.lister.is_some() || self.fut.is_some() {
             Poll::Pending
         } else {
             Poll::Ready(None)