chore: Enable new rust code format settings (#483)

* chore: Enable new format settings

Signed-off-by: Xuanwo <github@xuanwo.io>

* Format

Signed-off-by: Xuanwo <github@xuanwo.io>

---------

Signed-off-by: Xuanwo <github@xuanwo.io>

crates/catalog/glue/src/catalog.rs

@@ -15,6 +15,9 @@
 // specific language governing permissions and limitations
 // under the License.
 
+use std::collections::HashMap;
+use std::fmt::Debug;
+
 use async_trait::async_trait;
 use aws_sdk_glue::types::TableInput;
 use iceberg::io::FileIO;
@@ -24,8 +27,6 @@ use iceberg::{
     Catalog, Error, ErrorKind, Namespace, NamespaceIdent, Result, TableCommit, TableCreation,
     TableIdent,
 };
-use std::{collections::HashMap, fmt::Debug};
-
 use typed_builder::TypedBuilder;
 
 use crate::error::{from_aws_build_error, from_aws_sdk_error};

crates/catalog/glue/src/error.rs

@@ -15,16 +15,14 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use anyhow::anyhow;
 use std::fmt::Debug;
 
+use anyhow::anyhow;
 use iceberg::{Error, ErrorKind};
 
 /// Format AWS SDK error into iceberg error
 pub(crate) fn from_aws_sdk_error<T>(error: aws_sdk_glue::error::SdkError<T>) -> Error
-where
-    T: Debug,
-{
+where T: Debug {
     Error::new(
         ErrorKind::Unexpected,
         "Operation failed for hitting aws skd error".to_string(),

crates/catalog/glue/src/schema.rs

@@ -24,12 +24,9 @@ pub(crate) const ICEBERG_FIELD_CURRENT: &str = "iceberg.field.current";
 
 use std::collections::HashMap;
 
-use iceberg::{
-    spec::{visit_schema, PrimitiveType, SchemaVisitor, TableMetadata},
-    Error, ErrorKind, Result,
-};
-
 use aws_sdk_glue::types::Column;
+use iceberg::spec::{visit_schema, PrimitiveType, SchemaVisitor, TableMetadata};
+use iceberg::{Error, ErrorKind, Result};
 
 use crate::error::from_aws_build_error;
 
@@ -188,10 +185,8 @@ impl SchemaVisitor for GlueSchemaBuilder {
 
 #[cfg(test)]
 mod tests {
-    use iceberg::{
-        spec::{Schema, TableMetadataBuilder},
-        TableCreation,
-    };
+    use iceberg::spec::{Schema, TableMetadataBuilder};
+    use iceberg::TableCreation;
 
     use super::*;
 

crates/catalog/glue/src/utils.rs

@@ -18,15 +18,14 @@
 use std::collections::HashMap;
 
 use aws_config::{BehaviorVersion, Region, SdkConfig};
-use aws_sdk_glue::{
-    config::Credentials,
-    types::{Database, DatabaseInput, StorageDescriptor, TableInput},
-};
+use aws_sdk_glue::config::Credentials;
+use aws_sdk_glue::types::{Database, DatabaseInput, StorageDescriptor, TableInput};
 use iceberg::spec::TableMetadata;
 use iceberg::{Error, ErrorKind, Namespace, NamespaceIdent, Result};
 use uuid::Uuid;
 
-use crate::{error::from_aws_build_error, schema::GlueSchemaBuilder};
+use crate::error::from_aws_build_error;
+use crate::schema::GlueSchemaBuilder;
 
 /// Property aws profile name
 pub const AWS_PROFILE_NAME: &str = "profile_name";
@@ -286,15 +285,13 @@ macro_rules! with_catalog_id {
 
 #[cfg(test)]
 mod tests {
-    use aws_sdk_glue::{config::ProvideCredentials, types::Column};
-    use iceberg::{
-        spec::{NestedField, PrimitiveType, Schema, TableMetadataBuilder, Type},
-        Namespace, Result, TableCreation,
-    };
-
-    use crate::schema::{ICEBERG_FIELD_CURRENT, ICEBERG_FIELD_ID, ICEBERG_FIELD_OPTIONAL};
+    use aws_sdk_glue::config::ProvideCredentials;
+    use aws_sdk_glue::types::Column;
+    use iceberg::spec::{NestedField, PrimitiveType, Schema, TableMetadataBuilder, Type};
+    use iceberg::{Namespace, Result, TableCreation};
 
     use super::*;
+    use crate::schema::{ICEBERG_FIELD_CURRENT, ICEBERG_FIELD_ID, ICEBERG_FIELD_OPTIONAL};
 
     fn create_metadata(schema: Schema) -> Result<TableMetadata> {
         let table_creation = TableCreation::builder()

crates/catalog/hms/src/catalog.rs

@@ -15,30 +15,29 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use crate::error::from_thrift_error;
-use crate::error::{from_io_error, from_thrift_exception};
+use std::collections::HashMap;
+use std::fmt::{Debug, Formatter};
+use std::net::ToSocketAddrs;
 
-use super::utils::*;
 use anyhow::anyhow;
 use async_trait::async_trait;
-use hive_metastore::ThriftHiveMetastoreClient;
-use hive_metastore::ThriftHiveMetastoreClientBuilder;
-use hive_metastore::ThriftHiveMetastoreGetDatabaseException;
-use hive_metastore::ThriftHiveMetastoreGetTableException;
+use hive_metastore::{
+    ThriftHiveMetastoreClient, ThriftHiveMetastoreClientBuilder,
+    ThriftHiveMetastoreGetDatabaseException, ThriftHiveMetastoreGetTableException,
+};
 use iceberg::io::FileIO;
-use iceberg::spec::TableMetadata;
-use iceberg::spec::TableMetadataBuilder;
+use iceberg::spec::{TableMetadata, TableMetadataBuilder};
 use iceberg::table::Table;
 use iceberg::{
     Catalog, Error, ErrorKind, Namespace, NamespaceIdent, Result, TableCommit, TableCreation,
     TableIdent,
 };
-use std::collections::HashMap;
-use std::fmt::{Debug, Formatter};
-use std::net::ToSocketAddrs;
 use typed_builder::TypedBuilder;
 use volo_thrift::MaybeException;
 
+use super::utils::*;
+use crate::error::{from_io_error, from_thrift_error, from_thrift_exception};
+
 /// Which variant of the thrift transport to communicate with HMS
 /// See: <https://github.com/apache/thrift/blob/master/doc/specs/thrift-rpc.md#framed-vs-unframed-transport>
 #[derive(Debug, Default)]

crates/catalog/hms/src/error.rs

@@ -15,10 +15,11 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use anyhow::anyhow;
-use iceberg::{Error, ErrorKind};
 use std::fmt::Debug;
 use std::io;
+
+use anyhow::anyhow;
+use iceberg::{Error, ErrorKind};
 use volo_thrift::MaybeException;
 
 /// Format a thrift error into iceberg error.

crates/catalog/hms/src/schema.rs

@@ -142,7 +142,8 @@ impl SchemaVisitor for HiveSchemaBuilder {
 
 #[cfg(test)]
 mod tests {
-    use iceberg::{spec::Schema, Result};
+    use iceberg::spec::Schema;
+    use iceberg::Result;
 
     use super::*;
 

crates/catalog/hms/src/utils.rs

@@ -15,11 +15,13 @@
 // specific language governing permissions and limitations
 // under the License.
 
+use std::collections::HashMap;
+
 use chrono::Utc;
 use hive_metastore::{Database, PrincipalType, SerDeInfo, StorageDescriptor};
-use iceberg::{spec::Schema, Error, ErrorKind, Namespace, NamespaceIdent, Result};
+use iceberg::spec::Schema;
+use iceberg::{Error, ErrorKind, Namespace, NamespaceIdent, Result};
 use pilota::{AHashMap, FastStr};
-use std::collections::HashMap;
 use uuid::Uuid;
 
 use crate::schema::HiveSchemaBuilder;
@@ -336,10 +338,8 @@ fn get_current_time() -> Result<i32> {
 
 #[cfg(test)]
 mod tests {
-    use iceberg::{
-        spec::{NestedField, PrimitiveType, Type},
-        Namespace, NamespaceIdent,
-    };
+    use iceberg::spec::{NestedField, PrimitiveType, Type};
+    use iceberg::{Namespace, NamespaceIdent};
 
     use super::*;
 

crates/catalog/hms/tests/hms_catalog_test.rs

@@ -235,10 +235,10 @@ async fn test_list_tables() -> Result<()> {
     catalog.create_table(ns.name(), creation).await?;
     let result = catalog.list_tables(ns.name()).await?;
 
-    assert_eq!(
-        result,
-        vec![TableIdent::new(ns.name().clone(), "my_table".to_string())]
-    );
+    assert_eq!(result, vec![TableIdent::new(
+        ns.name().clone(),
+        "my_table".to_string()
+    )]);
 
     Ok(())
 }

crates/catalog/rest/src/catalog.rs

@@ -21,8 +21,16 @@ use std::collections::HashMap;
 use std::str::FromStr;
 
 use async_trait::async_trait;
+use iceberg::io::FileIO;
+use iceberg::table::Table;
+use iceberg::{
+    Catalog, Error, ErrorKind, Namespace, NamespaceIdent, Result, TableCommit, TableCreation,
+    TableIdent,
+};
 use itertools::Itertools;
-use reqwest::header::{self, HeaderMap, HeaderName, HeaderValue};
+use reqwest::header::{
+    HeaderMap, HeaderName, HeaderValue, {self},
+};
 use reqwest::{Method, StatusCode, Url};
 use tokio::sync::OnceCell;
 use typed_builder::TypedBuilder;
@@ -33,12 +41,6 @@ use crate::types::{
     ListNamespaceResponse, ListTableResponse, LoadTableResponse, NamespaceSerde,
     RenameTableRequest, NO_CONTENT, OK,
 };
-use iceberg::io::FileIO;
-use iceberg::table::Table;
-use iceberg::Result;
-use iceberg::{
-    Catalog, Error, ErrorKind, Namespace, NamespaceIdent, TableCommit, TableCreation, TableIdent,
-};
 
 const ICEBERG_REST_SPEC_VERSION: &str = "0.14.1";
 const CARGO_PKG_VERSION: &str = env!("CARGO_PKG_VERSION");
@@ -670,6 +672,10 @@ impl Catalog for RestCatalog {
 
 #[cfg(test)]
 mod tests {
+    use std::fs::File;
+    use std::io::BufReader;
+    use std::sync::Arc;
+
     use chrono::{TimeZone, Utc};
     use iceberg::spec::{
         FormatVersion, NestedField, NullOrder, Operation, PrimitiveType, Schema, Snapshot,
@@ -679,9 +685,6 @@ mod tests {
     use iceberg::transaction::Transaction;
     use mockito::{Mock, Server, ServerGuard};
     use serde_json::json;
-    use std::fs::File;
-    use std::io::BufReader;
-    use std::sync::Arc;
     use uuid::uuid;
 
     use super::*;

crates/catalog/rest/src/client.rs

@@ -15,17 +15,18 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use crate::types::{ErrorResponse, TokenResponse, OK};
-use crate::RestCatalogConfig;
-use iceberg::Result;
-use iceberg::{Error, ErrorKind};
-use reqwest::header::HeaderMap;
-use reqwest::{Client, IntoUrl, Method, Request, RequestBuilder, Response};
-use serde::de::DeserializeOwned;
 use std::collections::HashMap;
 use std::fmt::{Debug, Formatter};
 use std::sync::Mutex;
 
+use iceberg::{Error, ErrorKind, Result};
+use reqwest::header::HeaderMap;
+use reqwest::{Client, IntoUrl, Method, Request, RequestBuilder, Response};
+use serde::de::DeserializeOwned;
+
+use crate::types::{ErrorResponse, TokenResponse, OK};
+use crate::RestCatalogConfig;
+
 pub(crate) struct HttpClient {
     client: Client,
 

crates/catalog/rest/src/types.rs

@@ -17,12 +17,11 @@
 
 use std::collections::HashMap;
 
-use serde_derive::{Deserialize, Serialize};
-
 use iceberg::spec::{Schema, SortOrder, TableMetadata, UnboundPartitionSpec};
 use iceberg::{
     Error, ErrorKind, Namespace, NamespaceIdent, TableIdent, TableRequirement, TableUpdate,
 };
+use serde_derive::{Deserialize, Serialize};
 
 pub(super) const OK: u16 = 200u16;
 pub(super) const NO_CONTENT: u16 = 204u16;

crates/catalog/rest/tests/rest_catalog_test.rs

@@ -17,6 +17,9 @@
 
 //! Integration tests for rest catalog.
 
+use std::collections::HashMap;
+use std::sync::RwLock;
+
 use ctor::{ctor, dtor};
 use iceberg::spec::{FormatVersion, NestedField, PrimitiveType, Schema, Type};
 use iceberg::transaction::Transaction;
@@ -25,8 +28,6 @@ use iceberg_catalog_rest::{RestCatalog, RestCatalogConfig};
 use iceberg_test_utils::docker::DockerCompose;
 use iceberg_test_utils::{normalize_test_name, set_up};
 use port_scanner::scan_port_addr;
-use std::collections::HashMap;
-use std::sync::RwLock;
 use tokio::time::sleep;
 
 const REST_CATALOG_PORT: u16 = 8181;

crates/examples/src/rest_catalog_namespace.rs

@@ -15,9 +15,10 @@
 // specific language governing permissions and limitations
 // under the License.
 
+use std::collections::HashMap;
+
 use iceberg::{Catalog, NamespaceIdent};
 use iceberg_catalog_rest::{RestCatalog, RestCatalogConfig};
-use std::collections::HashMap;
 
 #[tokio::main]
 async fn main() {

crates/examples/src/rest_catalog_table.rs

@@ -15,10 +15,11 @@
 // specific language governing permissions and limitations
 // under the License.
 
+use std::collections::HashMap;
+
 use iceberg::spec::{NestedField, PrimitiveType, Schema, Type};
 use iceberg::{Catalog, TableCreation, TableIdent};
 use iceberg_catalog_rest::{RestCatalog, RestCatalogConfig};
-use std::collections::HashMap;
 
 #[tokio::main]
 async fn main() {

crates/iceberg/src/arrow/reader.rs

@@ -17,7 +17,11 @@
 
 //! Parquet file data reader
 
-use crate::error::Result;
+use std::collections::{HashMap, HashSet};
+use std::ops::Range;
+use std::str::FromStr;
+use std::sync::Arc;
+
 use arrow_arith::boolean::{and, is_not_null, is_null, not, or};
 use arrow_array::{ArrayRef, BooleanArray, RecordBatch};
 use arrow_ord::cmp::{eq, gt, gt_eq, lt, lt_eq, neq};
@@ -34,12 +38,9 @@ use parquet::arrow::async_reader::{AsyncFileReader, MetadataLoader};
 use parquet::arrow::{ParquetRecordBatchStreamBuilder, ProjectionMask, PARQUET_FIELD_ID_META_KEY};
 use parquet::file::metadata::ParquetMetaData;
 use parquet::schema::types::{SchemaDescriptor, Type as ParquetType};
-use std::collections::{HashMap, HashSet};
-use std::ops::Range;
-use std::str::FromStr;
-use std::sync::Arc;
 
 use crate::arrow::{arrow_schema_to_schema, get_arrow_datum};
+use crate::error::Result;
 use crate::expr::visitors::bound_predicate_visitor::{visit, BoundPredicateVisitor};
 use crate::expr::{BoundPredicate, BoundReference};
 use crate::io::{FileIO, FileMetadata, FileRead};
@@ -859,12 +860,13 @@ impl<R: FileRead> AsyncFileReader for ArrowFileReader<R> {
 
 #[cfg(test)]
 mod tests {
+    use std::collections::HashSet;
+    use std::sync::Arc;
+
     use crate::arrow::reader::CollectFieldIdVisitor;
     use crate::expr::visitors::bound_predicate_visitor::visit;
     use crate::expr::{Bind, Reference};
     use crate::spec::{NestedField, PrimitiveType, Schema, SchemaRef, Type};
-    use std::collections::HashSet;
-    use std::sync::Arc;
 
     fn table_schema_simple() -> SchemaRef {
         Arc::new(