fmt is good

Author: CTTY

crates/iceberg/src/io/file_io.rs

@@ -20,6 +20,7 @@ use std::collections::HashMap;
 use std::fmt::Debug;
 use std::ops::Range;
 use std::sync::Arc;
+
 use async_trait::async_trait;
 use bytes::Bytes;
 use url::Url;
@@ -32,16 +33,16 @@ use crate::{Error, ErrorKind, Result};
 pub trait Storage: Debug + Send + Sync {
     /// Check if a file exists at the given path
     async fn exists(&self, path: &str) -> Result<bool>;
-    
+
     /// Get metadata from an input path
     async fn metadata(&self, path: &str) -> Result<FileMetadata>;
-    
+
     /// Read bytes from a path
     async fn read(&self, path: &str) -> Result<Bytes>;
-    
+
     /// Get FileRead from a path
     async fn reader(&self, path: &str) -> Result<Box<dyn FileRead>>;
-    
+
     /// Write bytes to an output path
     async fn write(&self, path: &str, bs: Bytes) -> Result<()>;
 
@@ -319,7 +320,7 @@ pub trait FileRead: Send + Sync + Unpin + 'static {
 
 #[async_trait::async_trait]
 impl FileRead for opendal::Reader {
-    async fn read(&self, range: Range<u64>) -> crate::Result<Bytes> {
+    async fn read(&self, range: Range<u64>) -> Result<Bytes> {
         Ok(opendal::Reader::read(self, range).await?.to_bytes())
     }
 }
@@ -344,23 +345,20 @@ impl InputFile {
     }
 
     /// Check if file exists.
-    pub async fn exists(&self) -> crate::Result<bool> {
+    pub async fn exists(&self) -> Result<bool> {
         self.storage.exists(&self.path).await
     }
 
     /// Fetch and returns metadata of file.
-    pub async fn metadata(&self) -> crate::Result<FileMetadata> {
+    pub async fn metadata(&self) -> Result<FileMetadata> {
         self.storage.metadata(&self.path).await
     }
 
     /// Read and returns whole content of file.
     ///
     /// For continuous reading, use [`Self::reader`] instead.
     pub async fn read(&self) -> Result<Bytes> {
-        self
-            .storage
-            .read(&self.path)
-            .await
+        self.storage.read(&self.path).await
     }
 
     /// Creates [`FileRead`] for continuous reading.
@@ -468,9 +466,7 @@ impl OutputFile {
     ///
     /// For one-time writing, use [`Self::write`] instead.
     pub async fn writer(&self) -> crate::Result<Box<dyn FileWrite>> {
-        Ok(Box::new(
-            self.storage.writer(&self.path).await?
-        ))
+        Ok(Box::new(self.storage.writer(&self.path).await?))
     }
 }
 

crates/iceberg/src/io/storage.rs

@@ -15,8 +15,8 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use crate::Result;
 use std::sync::Arc;
+
 use async_trait::async_trait;
 use bytes::Bytes;
 use opendal::layers::RetryLayer;
@@ -35,7 +35,7 @@ use super::AzureStorageScheme;
 use super::{FileIOBuilder, FileMetadata, FileRead, FileWrite, InputFile, OutputFile, Storage};
 #[cfg(feature = "storage-s3")]
 use crate::io::CustomAwsCredentialLoader;
-use crate::{Error, ErrorKind};
+use crate::{Error, ErrorKind, Result};
 
 /// The storage carries all supported storage services in iceberg
 #[derive(Debug, Clone)]
@@ -79,7 +79,7 @@ impl Storage for OpenDALStorage {
     async fn metadata(&self, path: &str) -> Result<FileMetadata> {
         let (op, relative_path) = self.create_operator(&path)?;
         let meta = op.stat(relative_path).await?;
-        
+
         Ok(FileMetadata {
             size: meta.content_length(),
         })
@@ -103,9 +103,7 @@ impl Storage for OpenDALStorage {
 
     async fn writer(&self, path: &str) -> Result<Box<dyn FileWrite>> {
         let (op, relative_path) = self.create_operator(&path)?;
-        Ok(Box::new(
-            op.writer(relative_path).await?,
-        ))
+        Ok(Box::new(op.writer(relative_path).await?))
     }
 
     async fn delete(&self, path: &str) -> Result<()> {
@@ -126,19 +124,13 @@ impl Storage for OpenDALStorage {
     fn new_input(&self, path: &str) -> Result<InputFile> {
         let storage = Arc::new(self.clone());
         let path = path.to_string();
-        Ok(InputFile {
-            storage,
-            path,
-        })
+        Ok(InputFile { storage, path })
     }
 
     fn new_output(&self, path: &str) -> Result<OutputFile> {
         let storage = Arc::new(self.clone());
         let path = path.to_string();
-        Ok(OutputFile {
-            storage,
-            path,
-        })
+        Ok(OutputFile { storage, path })
     }
 }
 

crates/iceberg/src/puffin/metadata.rs

@@ -16,6 +16,7 @@
 // under the License.
 
 use std::collections::{HashMap, HashSet};
+
 use bytes::Bytes;
 use serde::{Deserialize, Serialize};
 
@@ -288,9 +289,12 @@ impl FileMetadata {
         let input_file_length = input_file.metadata().await?.size;
         let footer_payload_length =
             FileMetadata::read_footer_payload_length(file_read.as_ref(), input_file_length).await?;
-        let footer_bytes =
-            FileMetadata::read_footer_bytes(file_read.as_ref(), input_file_length, footer_payload_length)
-                .await?;
+        let footer_bytes = FileMetadata::read_footer_bytes(
+            file_read.as_ref(),
+            input_file_length,
+            footer_payload_length,
+        )
+        .await?;
 
         let magic_length = FileMetadata::MAGIC_LENGTH as usize;
         // check first four bytes of footer