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/04/23 14:17:29 UTC
(opendal) 05/05: format code
This is an automated email from the ASF dual-hosted git repository.
xuanwo pushed a commit to branch refactor-dir
in repository https://gitbox.apache.org/repos/asf/opendal.git
commit a4308b5ec5835ada7fc6b92df17b69cb647f6ffa
Author: Xuanwo <gi...@xuanwo.io>
AuthorDate: Tue Apr 23 22:17:09 2024 +0800
format code
Signed-off-by: Xuanwo <gi...@xuanwo.io>
---
core/src/raw/adapters/kv/backend.rs | 3 +-
core/src/raw/adapters/typed_kv/api.rs | 3 +-
core/src/raw/adapters/typed_kv/backend.rs | 3 +-
core/src/raw/oio/buf/flex_buf.rs | 4 ++-
core/src/raw/oio/buf/queue_buf.rs | 6 ++--
core/src/raw/oio/write/exact_buf_write.rs | 3 +-
core/src/services/d1/model.rs | 3 +-
core/src/services/dbfs/reader.rs | 1 -
core/src/services/fs/writer.rs | 2 +-
core/src/services/ftp/writer.rs | 7 +++--
core/src/services/hdfs/writer.rs | 2 +-
core/src/services/sftp/writer.rs | 2 +-
core/src/services/surrealdb/backend.rs | 3 +-
core/src/types/buffer.rs | 20 ++++++++-----
core/src/types/reader/buffer_stream.rs | 25 ++++++++++------
core/src/types/reader/futures_async_reader.rs | 9 ++++--
core/src/types/reader/futures_bytes_stream.rs | 6 ++--
core/src/types/reader/reader.rs | 43 +++++++++++++++++++--------
18 files changed, 94 insertions(+), 51 deletions(-)
diff --git a/core/src/raw/adapters/kv/backend.rs b/core/src/raw/adapters/kv/backend.rs
index 73f7ca8cab..ccb3f822c0 100644
--- a/core/src/raw/adapters/kv/backend.rs
+++ b/core/src/raw/adapters/kv/backend.rs
@@ -21,7 +21,8 @@ use std::vec::IntoIter;
use async_trait::async_trait;
use super::Adapter;
-use crate::raw::oio::{HierarchyLister, QueueBuf};
+use crate::raw::oio::HierarchyLister;
+use crate::raw::oio::QueueBuf;
use crate::raw::*;
use crate::*;
diff --git a/core/src/raw/adapters/typed_kv/api.rs b/core/src/raw/adapters/typed_kv/api.rs
index 9b44c67e61..30e424765d 100644
--- a/core/src/raw/adapters/typed_kv/api.rs
+++ b/core/src/raw/adapters/typed_kv/api.rs
@@ -21,12 +21,13 @@ use std::mem::size_of;
use async_trait::async_trait;
use chrono::Utc;
+use crate::Buffer;
+use crate::EntryMode;
use crate::Error;
use crate::ErrorKind;
use crate::Metadata;
use crate::Result;
use crate::Scheme;
-use crate::{Buffer, EntryMode};
/// Adapter is the typed adapter to underlying kv services.
///
diff --git a/core/src/raw/adapters/typed_kv/backend.rs b/core/src/raw/adapters/typed_kv/backend.rs
index 500ec205eb..c23549c381 100644
--- a/core/src/raw/adapters/typed_kv/backend.rs
+++ b/core/src/raw/adapters/typed_kv/backend.rs
@@ -22,7 +22,8 @@ use async_trait::async_trait;
use super::Adapter;
use super::Value;
-use crate::raw::oio::{HierarchyLister, QueueBuf};
+use crate::raw::oio::HierarchyLister;
+use crate::raw::oio::QueueBuf;
use crate::raw::*;
use crate::*;
diff --git a/core/src/raw/oio/buf/flex_buf.rs b/core/src/raw/oio/buf/flex_buf.rs
index b58af3c11d..043c19a2c2 100644
--- a/core/src/raw/oio/buf/flex_buf.rs
+++ b/core/src/raw/oio/buf/flex_buf.rs
@@ -15,8 +15,10 @@
// specific language governing permissions and limitations
// under the License.
+use bytes::Buf;
+use bytes::BufMut;
+use bytes::Bytes;
use bytes::BytesMut;
-use bytes::{Buf, BufMut, Bytes};
/// FlexBuf is a buffer that support frozen bytes and reuse existing allocated memory.
///
diff --git a/core/src/raw/oio/buf/queue_buf.rs b/core/src/raw/oio/buf/queue_buf.rs
index 102ee8c3d8..168f2ee8f5 100644
--- a/core/src/raw/oio/buf/queue_buf.rs
+++ b/core/src/raw/oio/buf/queue_buf.rs
@@ -15,10 +15,12 @@
// specific language governing permissions and limitations
// under the License.
-use crate::*;
-use bytes::Buf;
use std::collections::VecDeque;
+use bytes::Buf;
+
+use crate::*;
+
/// QueueBuf is a queue of [`Buffer`].
///
/// It's designed to allow storing multiple buffers without copying underlying bytes and consume them
diff --git a/core/src/raw/oio/write/exact_buf_write.rs b/core/src/raw/oio/write/exact_buf_write.rs
index 3934915cc7..a5650b58a3 100644
--- a/core/src/raw/oio/write/exact_buf_write.rs
+++ b/core/src/raw/oio/write/exact_buf_write.rs
@@ -79,7 +79,8 @@ impl<W: oio::Write> oio::Write for ExactBufWriter<W> {
#[cfg(test)]
mod tests {
- use bytes::{Buf, Bytes};
+ use bytes::Buf;
+ use bytes::Bytes;
use log::debug;
use pretty_assertions::assert_eq;
use rand::thread_rng;
diff --git a/core/src/services/d1/model.rs b/core/src/services/d1/model.rs
index 3dc713dc0a..b4b0f25c8d 100644
--- a/core/src/services/d1/model.rs
+++ b/core/src/services/d1/model.rs
@@ -23,7 +23,8 @@ use serde::Serialize;
use serde_json::Map;
use serde_json::Value;
-use crate::{Buffer, Error};
+use crate::Buffer;
+use crate::Error;
/// response data from d1
#[derive(Deserialize, Debug)]
diff --git a/core/src/services/dbfs/reader.rs b/core/src/services/dbfs/reader.rs
index 9ae4bc4d83..1030c15e08 100644
--- a/core/src/services/dbfs/reader.rs
+++ b/core/src/services/dbfs/reader.rs
@@ -23,7 +23,6 @@ use bytes::Bytes;
use serde::Deserialize;
use super::core::DbfsCore;
-
use crate::raw::*;
use crate::*;
diff --git a/core/src/services/fs/writer.rs b/core/src/services/fs/writer.rs
index 7ec3ce9c37..c0d0688750 100644
--- a/core/src/services/fs/writer.rs
+++ b/core/src/services/fs/writer.rs
@@ -15,10 +15,10 @@
// specific language governing permissions and limitations
// under the License.
-use bytes::Buf;
use std::io::Write;
use std::path::PathBuf;
+use bytes::Buf;
use tokio::io::AsyncWriteExt;
use crate::raw::*;
diff --git a/core/src/services/ftp/writer.rs b/core/src/services/ftp/writer.rs
index c206d157c7..0efa7667ac 100644
--- a/core/src/services/ftp/writer.rs
+++ b/core/src/services/ftp/writer.rs
@@ -17,14 +17,15 @@
use bb8::PooledConnection;
use bytes::Buf;
-use futures::{AsyncRead, AsyncWrite, AsyncWriteExt};
+use futures::AsyncRead;
+use futures::AsyncWrite;
+use futures::AsyncWriteExt;
+use super::backend::Manager;
use crate::raw::*;
use crate::services::ftp::err::parse_error;
use crate::*;
-use super::backend::Manager;
-
trait DataStream: AsyncRead + AsyncWrite {}
impl<T> DataStream for T where T: AsyncRead + AsyncWrite {}
diff --git a/core/src/services/hdfs/writer.rs b/core/src/services/hdfs/writer.rs
index 277ad0e3e8..96708c1ab1 100644
--- a/core/src/services/hdfs/writer.rs
+++ b/core/src/services/hdfs/writer.rs
@@ -15,10 +15,10 @@
// specific language governing permissions and limitations
// under the License.
-use bytes::Buf;
use std::io::Write;
use std::sync::Arc;
+use bytes::Buf;
use futures::AsyncWriteExt;
use crate::raw::*;
diff --git a/core/src/services/sftp/writer.rs b/core/src/services/sftp/writer.rs
index d31e0e2ef4..69bff86245 100644
--- a/core/src/services/sftp/writer.rs
+++ b/core/src/services/sftp/writer.rs
@@ -15,9 +15,9 @@
// specific language governing permissions and limitations
// under the License.
-use bytes::Buf;
use std::pin::Pin;
+use bytes::Buf;
use openssh_sftp_client::file::File;
use openssh_sftp_client::file::TokioCompatFile;
use tokio::io::AsyncWriteExt;
diff --git a/core/src/services/surrealdb/backend.rs b/core/src/services/surrealdb/backend.rs
index dad0027e00..6b385b93ae 100644
--- a/core/src/services/surrealdb/backend.rs
+++ b/core/src/services/surrealdb/backend.rs
@@ -30,11 +30,12 @@ use tokio::sync::OnceCell;
use crate::raw::adapters::kv;
use crate::raw::normalize_root;
use crate::raw::ConfigDeserializer;
+use crate::Buffer;
+use crate::Builder;
use crate::Capability;
use crate::Error;
use crate::ErrorKind;
use crate::Scheme;
-use crate::{Buffer, Builder};
/// Config for Surrealdb services support.
#[derive(Default, Deserialize)]
diff --git a/core/src/types/buffer.rs b/core/src/types/buffer.rs
index f5a39aa5b8..59a4001426 100644
--- a/core/src/types/buffer.rs
+++ b/core/src/types/buffer.rs
@@ -17,16 +17,21 @@
use std::collections::VecDeque;
use std::convert::Infallible;
-use std::fmt::{Debug, Formatter};
+use std::fmt::Debug;
+use std::fmt::Formatter;
use std::io::IoSlice;
use std::mem;
-use std::ops::{Bound, RangeBounds};
+use std::ops::Bound;
+use std::ops::RangeBounds;
use std::pin::Pin;
use std::sync::Arc;
-use std::task::{Context, Poll};
+use std::task::Context;
+use std::task::Poll;
-use bytes::{Buf, BytesMut};
-use bytes::{BufMut, Bytes};
+use bytes::Buf;
+use bytes::BufMut;
+use bytes::Bytes;
+use bytes::BytesMut;
use futures::Stream;
/// Buffer is a wrapper of contiguous `Bytes` and non contiguous `[Bytes]`.
@@ -48,8 +53,8 @@ use futures::Stream;
///
/// ```rust
/// use bytes::Buf;
-/// use serde_json;
/// use opendal::Buffer;
+/// use serde_json;
///
/// fn test(mut buf: Buffer) -> Vec<String> {
/// serde_json::from_reader(buf.reader()).unwrap()
@@ -75,8 +80,8 @@ use futures::Stream;
///
/// ```rust
/// use bytes::Bytes;
-/// use opendal::Buffer;
/// use futures::TryStreamExt;
+/// use opendal::Buffer;
///
/// async fn test(mut buf: Buffer) -> Vec<Bytes> {
/// buf.into_iter().try_collect().await.unwrap()
@@ -102,7 +107,6 @@ use futures::Stream;
/// }
/// ```
///
-///
#[derive(Clone)]
pub struct Buffer(Inner);
diff --git a/core/src/types/reader/buffer_stream.rs b/core/src/types/reader/buffer_stream.rs
index f5cd6cc0df..d289994c33 100644
--- a/core/src/types/reader/buffer_stream.rs
+++ b/core/src/types/reader/buffer_stream.rs
@@ -15,16 +15,21 @@
// specific language governing permissions and limitations
// under the License.
+use std::ops::Bound;
+use std::ops::RangeBounds;
use std::pin::Pin;
+use std::sync::atomic::AtomicBool;
use std::sync::atomic::Ordering;
-use std::task::{Context, Poll};
-use std::{
- ops::{Bound, RangeBounds},
- sync::{atomic::AtomicBool, Arc},
-};
+use std::sync::Arc;
+use std::task::Context;
+use std::task::Poll;
-use futures::stream::{self, Buffered, FusedStream, Iter};
-use futures::{Stream, StreamExt};
+use futures::stream::Buffered;
+use futures::stream::FusedStream;
+use futures::stream::Iter;
+use futures::stream::{self};
+use futures::Stream;
+use futures::StreamExt;
use crate::raw::*;
use crate::*;
@@ -138,11 +143,13 @@ impl FusedStream for BufferStream {
#[cfg(test)]
mod tests {
- use super::*;
- use bytes::{Buf, Bytes};
+ use bytes::Buf;
+ use bytes::Bytes;
use futures::TryStreamExt;
use pretty_assertions::assert_eq;
+ use super::*;
+
/// Make sure BufferStream implements `Unpin` and `Send`.
trait AssertTrait: Unpin + MaybeSend + 'static {}
impl AssertTrait for BufferStream {}
diff --git a/core/src/types/reader/futures_async_reader.rs b/core/src/types/reader/futures_async_reader.rs
index 9c3b3640a5..d586264392 100644
--- a/core/src/types/reader/futures_async_reader.rs
+++ b/core/src/types/reader/futures_async_reader.rs
@@ -169,12 +169,15 @@ impl AsyncSeek for FuturesAsyncReader {
#[cfg(test)]
mod tests {
- use super::*;
+ use std::sync::Arc;
+
use bytes::Bytes;
use futures::AsyncBufReadExt;
- use futures::{AsyncReadExt, AsyncSeekExt};
+ use futures::AsyncReadExt;
+ use futures::AsyncSeekExt;
use pretty_assertions::assert_eq;
- use std::sync::Arc;
+
+ use super::*;
#[tokio::test]
async fn test_futures_async_read() {
diff --git a/core/src/types/reader/futures_bytes_stream.rs b/core/src/types/reader/futures_bytes_stream.rs
index b460ec759f..13c92592f7 100644
--- a/core/src/types/reader/futures_bytes_stream.rs
+++ b/core/src/types/reader/futures_bytes_stream.rs
@@ -76,11 +76,13 @@ impl Stream for FuturesBytesStream {
#[cfg(test)]
mod tests {
- use super::*;
+ use std::sync::Arc;
+
use bytes::Bytes;
use futures::TryStreamExt;
use pretty_assertions::assert_eq;
- use std::sync::Arc;
+
+ use super::*;
#[tokio::test]
async fn test_futures_bytes_stream() {
diff --git a/core/src/types/reader/reader.rs b/core/src/types/reader/reader.rs
index a0651269c1..5bea167c7b 100644
--- a/core/src/types/reader/reader.rs
+++ b/core/src/types/reader/reader.rs
@@ -180,13 +180,17 @@ impl Reader {
/// ## Basic Usage
///
/// ```
+ /// use std::io;
+ ///
+ /// use futures::io::AsyncReadExt;
/// use opendal::Operator;
/// use opendal::Result;
- /// use futures::io::AsyncReadExt;
- /// use std::io;
///
/// async fn test(op: Operator) -> io::Result<()> {
- /// let mut r = op.reader("hello.txt").await?.into_futures_async_read(1024..2048);
+ /// let mut r = op
+ /// .reader("hello.txt")
+ /// .await?
+ /// .into_futures_async_read(1024..2048);
/// let mut bs = Vec::new();
/// r.read_to_end(&mut bs).await?;
///
@@ -199,13 +203,19 @@ impl Reader {
/// The following example reads data in 256B chunks with 8 concurrent.
///
/// ```
+ /// use std::io;
+ ///
+ /// use futures::io::AsyncReadExt;
/// use opendal::Operator;
/// use opendal::Result;
- /// use futures::io::AsyncReadExt;
- /// use std::io;
///
/// async fn test(op: Operator) -> io::Result<()> {
- /// let mut r = op.reader_with("hello.txt").concurrent(8).chunk(256).await?.into_futures_async_read(1024..2048);
+ /// let mut r = op
+ /// .reader_with("hello.txt")
+ /// .concurrent(8)
+ /// .chunk(256)
+ /// .await?
+ /// .into_futures_async_read(1024..2048);
/// let mut bs = Vec::new();
/// r.read_to_end(&mut bs).await?;
///
@@ -224,11 +234,12 @@ impl Reader {
/// ## Basic Usage
///
/// ```
- /// use opendal::Operator;
- /// use opendal::Result;
- /// use futures::TryStreamExt;
/// use std::io;
+ ///
/// use bytes::Bytes;
+ /// use futures::TryStreamExt;
+ /// use opendal::Operator;
+ /// use opendal::Result;
///
/// async fn test(op: Operator) -> io::Result<()> {
/// let mut s = op.reader("hello.txt").await?.into_bytes_stream(1024..2048);
@@ -243,14 +254,20 @@ impl Reader {
/// The following example reads data in 256B chunks with 8 concurrent.
///
/// ```
- /// use opendal::Operator;
- /// use opendal::Result;
- /// use futures::TryStreamExt;
/// use std::io;
+ ///
/// use bytes::Bytes;
+ /// use futures::TryStreamExt;
+ /// use opendal::Operator;
+ /// use opendal::Result;
///
/// async fn test(op: Operator) -> io::Result<()> {
- /// let mut s = op.reader_with("hello.txt").concurrent(8).chunk(256).await?.into_bytes_stream(1024..2048);
+ /// let mut s = op
+ /// .reader_with("hello.txt")
+ /// .concurrent(8)
+ /// .chunk(256)
+ /// .await?
+ /// .into_bytes_stream(1024..2048);
/// let bs: Vec<Bytes> = s.try_collect().await?;
///
/// Ok(())