From 61e1264e59e3ab57d09ad092115d8a0a1c13dab6 Mon Sep 17 00:00:00 2001 From: tottoto Date: Sun, 7 May 2023 09:09:14 +0900 Subject: [PATCH] refactor: Replace futures::ready with std::task::ready --- core/src/layers/retry.rs | 2 +- core/src/raw/http_util/body.rs | 2 +- core/src/raw/oio/into_reader/by_range.rs | 2 +- core/src/raw/oio/into_reader/from_fd.rs | 2 +- core/src/raw/oio/into_streamable.rs | 2 +- core/src/services/ftp/util.rs | 2 +- core/src/types/list.rs | 2 +- core/src/types/reader.rs | 2 +- core/src/types/writer.rs | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/core/src/layers/retry.rs b/core/src/layers/retry.rs index 341fd75ef18a..4ec483fd7342 100644 --- a/core/src/layers/retry.rs +++ b/core/src/layers/retry.rs @@ -19,6 +19,7 @@ use std::fmt::Debug; use std::fmt::Formatter; use std::io; use std::pin::Pin; +use std::task::ready; use std::task::Context; use std::task::Poll; use std::time::Duration; @@ -30,7 +31,6 @@ use backon::ExponentialBackoff; use backon::ExponentialBuilder; use backon::Retryable; use bytes::Bytes; -use futures::ready; use futures::FutureExt; use log::warn; diff --git a/core/src/raw/http_util/body.rs b/core/src/raw/http_util/body.rs index f6359ec4cee2..d9937ac25f57 100644 --- a/core/src/raw/http_util/body.rs +++ b/core/src/raw/http_util/body.rs @@ -18,13 +18,13 @@ use std::cmp::min; use std::cmp::Ordering; use std::io; +use std::task::ready; use std::task::Context; use std::task::Poll; use bytes::Buf; use bytes::BufMut; use bytes::Bytes; -use futures::ready; use futures::Stream; use futures::StreamExt; diff --git a/core/src/raw/oio/into_reader/by_range.rs b/core/src/raw/oio/into_reader/by_range.rs index a0128b1e57a5..71bb69067458 100644 --- a/core/src/raw/oio/into_reader/by_range.rs +++ b/core/src/raw/oio/into_reader/by_range.rs @@ -20,11 +20,11 @@ use std::future::Future; use std::io::SeekFrom; use std::pin::Pin; use std::sync::Arc; +use std::task::ready; use std::task::Context; use std::task::Poll; use futures::future::BoxFuture; -use futures::ready; use tokio::io::ReadBuf; use crate::ops::*; diff --git a/core/src/raw/oio/into_reader/from_fd.rs b/core/src/raw/oio/into_reader/from_fd.rs index 93322a46be97..c6a15231a2a4 100644 --- a/core/src/raw/oio/into_reader/from_fd.rs +++ b/core/src/raw/oio/into_reader/from_fd.rs @@ -18,10 +18,10 @@ use std::cmp; use std::io::SeekFrom; use std::pin::Pin; +use std::task::ready; use std::task::Context; use std::task::Poll; -use futures::ready; use futures::AsyncRead; use futures::AsyncSeek; diff --git a/core/src/raw/oio/into_streamable.rs b/core/src/raw/oio/into_streamable.rs index 47ec29df489d..50af7d975e59 100644 --- a/core/src/raw/oio/into_streamable.rs +++ b/core/src/raw/oio/into_streamable.rs @@ -16,11 +16,11 @@ // under the License. use std::io::SeekFrom; +use std::task::ready; use std::task::Context; use std::task::Poll; use bytes::Bytes; -use futures::ready; use tokio::io::ReadBuf; use crate::raw::*; diff --git a/core/src/services/ftp/util.rs b/core/src/services/ftp/util.rs index 0f26df6a0028..82d250e13ca2 100644 --- a/core/src/services/ftp/util.rs +++ b/core/src/services/ftp/util.rs @@ -17,12 +17,12 @@ use std::io; use std::pin::Pin; +use std::task::ready; use std::task::Context; use std::task::Poll; use bb8::PooledConnection; use futures::future::BoxFuture; -use futures::ready; use futures::AsyncRead; use futures::FutureExt; use suppaftp::Status; diff --git a/core/src/types/list.rs b/core/src/types/list.rs index 02395063ca19..708effae6470 100644 --- a/core/src/types/list.rs +++ b/core/src/types/list.rs @@ -18,11 +18,11 @@ use std::collections::VecDeque; use std::mem; use std::pin::Pin; +use std::task::ready; use std::task::Context; use std::task::Poll; use futures::future::BoxFuture; -use futures::ready; use futures::FutureExt; use futures::Stream; diff --git a/core/src/types/reader.rs b/core/src/types/reader.rs index 846be934b405..41998369a87d 100644 --- a/core/src/types/reader.rs +++ b/core/src/types/reader.rs @@ -17,11 +17,11 @@ use std::io; use std::pin::Pin; +use std::task::ready; use std::task::Context; use std::task::Poll; use bytes::Bytes; -use futures::ready; use futures::AsyncRead; use futures::AsyncSeek; use futures::Stream; diff --git a/core/src/types/writer.rs b/core/src/types/writer.rs index e9e4243ad205..e709dba36179 100644 --- a/core/src/types/writer.rs +++ b/core/src/types/writer.rs @@ -18,12 +18,12 @@ use std::fmt::Display; use std::io; use std::pin::Pin; +use std::task::ready; use std::task::Context; use std::task::Poll; use bytes::Bytes; use futures::future::BoxFuture; -use futures::ready; use futures::AsyncWrite; use futures::FutureExt;