From 2b1241de9691c47261ecd93aa40074b8c911a937 Mon Sep 17 00:00:00 2001 From: weisd Date: Tue, 1 Jul 2025 10:17:20 +0800 Subject: [PATCH] fix: fmt --- crates/notify/src/lib.rs | 2 +- crates/notify/src/rules/xml_config.rs | 2 +- crates/obs/src/metrics/system_process.rs | 3 +-- ecstore/src/client/api_put_object.rs | 4 +--- rustfs/src/storage/ecfs.rs | 22 +++++++++++----------- 5 files changed, 15 insertions(+), 18 deletions(-) diff --git a/crates/notify/src/lib.rs b/crates/notify/src/lib.rs index d0fa376f..da069849 100644 --- a/crates/notify/src/lib.rs +++ b/crates/notify/src/lib.rs @@ -26,7 +26,7 @@ pub use rules::BucketNotificationConfig; use std::io::IsTerminal; pub use target::Target; -use tracing_subscriber::{fmt, prelude::*, util::SubscriberInitExt, EnvFilter}; +use tracing_subscriber::{EnvFilter, fmt, prelude::*, util::SubscriberInitExt}; /// Initialize the tracing log system /// diff --git a/crates/notify/src/rules/xml_config.rs b/crates/notify/src/rules/xml_config.rs index b1f6f471..ea995ca9 100644 --- a/crates/notify/src/rules/xml_config.rs +++ b/crates/notify/src/rules/xml_config.rs @@ -1,5 +1,5 @@ use super::pattern; -use crate::arn::{ArnError, TargetIDError, ARN}; +use crate::arn::{ARN, ArnError, TargetIDError}; use crate::event::EventName; use serde::{Deserialize, Serialize}; use std::collections::HashSet; diff --git a/crates/obs/src/metrics/system_process.rs b/crates/obs/src/metrics/system_process.rs index a4cc9b9e..f021aabe 100644 --- a/crates/obs/src/metrics/system_process.rs +++ b/crates/obs/src/metrics/system_process.rs @@ -1,6 +1,5 @@ /// process related metric descriptors -use crate::metrics::{new_counter_md, new_gauge_md, subsystems, MetricDescriptor, MetricName}; - +use crate::metrics::{MetricDescriptor, MetricName, new_counter_md, new_gauge_md, subsystems}; lazy_static::lazy_static! { pub static ref PROCESS_LOCKS_READ_TOTAL_MD: MetricDescriptor = diff --git a/ecstore/src/client/api_put_object.rs b/ecstore/src/client/api_put_object.rs index 7e304f50..e71e6d0e 100644 --- a/ecstore/src/client/api_put_object.rs +++ b/ecstore/src/client/api_put_object.rs @@ -30,9 +30,7 @@ use crate::client::{ transition_api::{ReaderImpl, TransitionClient, UploadInfo}, utils::{is_amz_header, is_minio_header, is_rustfs_header, is_standard_header, is_storageclass_header}, }; -use rustfs_utils::{ - crypto::base64_encode, -}; +use rustfs_utils::crypto::base64_encode; #[derive(Debug, Clone)] pub struct AdvancedPutOptions { diff --git a/rustfs/src/storage/ecfs.rs b/rustfs/src/storage/ecfs.rs index 17ba383d..4fe33d16 100644 --- a/rustfs/src/storage/ecfs.rs +++ b/rustfs/src/storage/ecfs.rs @@ -16,8 +16,8 @@ use bytes::Bytes; use chrono::DateTime; use chrono::Utc; use datafusion::arrow::csv::WriterBuilder as CsvWriterBuilder; -use datafusion::arrow::json::writer::JsonArray; use datafusion::arrow::json::WriterBuilder as JsonWriterBuilder; +use datafusion::arrow::json::writer::JsonArray; // use ecstore::store_api::RESERVED_METADATA_PREFIX; use ecstore::bucket::lifecycle::bucket_lifecycle_ops::validate_transition_tier; @@ -35,13 +35,13 @@ use ecstore::bucket::tagging::decode_tags; use ecstore::bucket::tagging::encode_tags; use ecstore::bucket::utils::serialize; use ecstore::bucket::versioning_sys::BucketVersioningSys; +use ecstore::cmd::bucket_replication::ReplicationStatusType; +use ecstore::cmd::bucket_replication::ReplicationType; use ecstore::cmd::bucket_replication::get_must_replicate_options; use ecstore::cmd::bucket_replication::must_replicate; use ecstore::cmd::bucket_replication::schedule_replication; -use ecstore::cmd::bucket_replication::ReplicationStatusType; -use ecstore::cmd::bucket_replication::ReplicationType; -use ecstore::compress::is_compressible; use ecstore::compress::MIN_COMPRESSIBLE_SIZE; +use ecstore::compress::is_compressible; use ecstore::error::StorageError; use ecstore::new_object_layer_fn; use ecstore::set_disk::DEFAULT_READ_BUFFER_SIZE; @@ -60,11 +60,11 @@ use futures::StreamExt; use http::HeaderMap; use lazy_static::lazy_static; use policy::auth; -use policy::policy::action::Action; -use policy::policy::action::S3Action; use policy::policy::BucketPolicy; use policy::policy::BucketPolicyArgs; use policy::policy::Validator; +use policy::policy::action::Action; +use policy::policy::action::S3Action; use query::instance::make_rustfsms; use rustfs_filemeta::headers::RESERVED_METADATA_PREFIX_LOWER; use rustfs_filemeta::headers::{AMZ_DECODED_CONTENT_LENGTH, AMZ_OBJECT_TAGGING}; @@ -73,23 +73,23 @@ use rustfs_rio::EtagReader; use rustfs_rio::HashReader; use rustfs_rio::Reader; use rustfs_rio::WarpReader; -use rustfs_utils::path::path_join_buf; use rustfs_utils::CompressionAlgorithm; +use rustfs_utils::path::path_join_buf; use rustfs_zip::CompressionFormat; -use s3s::dto::*; -use s3s::s3_error; +use s3s::S3; use s3s::S3Error; use s3s::S3ErrorCode; use s3s::S3Result; -use s3s::S3; +use s3s::dto::*; +use s3s::s3_error; use s3s::{S3Request, S3Response}; use std::collections::HashMap; use std::fmt::Debug; use std::path::Path; use std::str::FromStr; use std::sync::Arc; -use time::format_description::well_known::Rfc3339; use time::OffsetDateTime; +use time::format_description::well_known::Rfc3339; use tokio::sync::mpsc; use tokio_stream::wrappers::ReceiverStream; use tokio_tar::Archive;