From ddf19b344443d5c777da4e10c9a94026c8dec001 Mon Sep 17 00:00:00 2001 From: weisd Date: Tue, 1 Jul 2025 13:05:33 +0800 Subject: [PATCH] fix: fmt --- crates/notify/src/rules/pattern_rules.rs | 2 +- ecstore/src/cmd/bucket_replication.rs | 1 - ecstore/src/heal/data_scanner.rs | 5 ++++- rustfs/src/admin/handlers/event.rs | 6 +++--- rustfs/src/main.rs | 1 - 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/crates/notify/src/rules/pattern_rules.rs b/crates/notify/src/rules/pattern_rules.rs index 9d64dbcf..215f3c0c 100644 --- a/crates/notify/src/rules/pattern_rules.rs +++ b/crates/notify/src/rules/pattern_rules.rs @@ -1,8 +1,8 @@ use super::pattern; use super::target_id_set::TargetIdSet; use crate::arn::TargetID; -use std::collections::HashMap; use serde::{Deserialize, Serialize}; +use std::collections::HashMap; /// PatternRules - Event rule that maps object name patterns to TargetID collections. /// `event.Rules` (map[string]TargetIDSet) in the Go code diff --git a/ecstore/src/cmd/bucket_replication.rs b/ecstore/src/cmd/bucket_replication.rs index 519fbf30..fb27da75 100644 --- a/ecstore/src/cmd/bucket_replication.rs +++ b/ecstore/src/cmd/bucket_replication.rs @@ -1136,7 +1136,6 @@ impl FromStr for ReplicationAction { // } // } - // 忽略大小写比较字符串列表 // fn equals(k1: &str, keys: &[&str]) -> bool { // keys.iter().any(|&k2| k1.eq_ignore_ascii_case(k2)) diff --git a/ecstore/src/heal/data_scanner.rs b/ecstore/src/heal/data_scanner.rs index 5c50c2a3..cd2fae95 100644 --- a/ecstore/src/heal/data_scanner.rs +++ b/ecstore/src/heal/data_scanner.rs @@ -759,7 +759,10 @@ impl ScannerItem { let replication = match metadata_sys::get_replication_config(&oi.bucket).await { Ok((replication, _)) => replication, Err(_) => { - error!("heal_replication: failed to get replication config for bucket: {} and object name: {}", oi.bucket, oi.name); + error!( + "heal_replication: failed to get replication config for bucket: {} and object name: {}", + oi.bucket, oi.name + ); return; } }; diff --git a/rustfs/src/admin/handlers/event.rs b/rustfs/src/admin/handlers/event.rs index 886e51fb..5aacca76 100644 --- a/rustfs/src/admin/handlers/event.rs +++ b/rustfs/src/admin/handlers/event.rs @@ -3,9 +3,9 @@ use crate::auth::{check_key_valid, get_session_token}; use http::{HeaderMap, StatusCode}; use matchit::Params; use rustfs_config::notify::{NOTIFY_MQTT_SUB_SYS, NOTIFY_WEBHOOK_SUB_SYS}; -use rustfs_notify::rules::{BucketNotificationConfig, PatternRules}; use rustfs_notify::EventName; -use s3s::{header::CONTENT_TYPE, s3_error, Body, S3Error, S3ErrorCode, S3Request, S3Response, S3Result}; +use rustfs_notify::rules::{BucketNotificationConfig, PatternRules}; +use s3s::{Body, S3Error, S3ErrorCode, S3Request, S3Response, S3Result, header::CONTENT_TYPE, s3_error}; use serde::{Deserialize, Serialize}; use serde_urlencoded::from_bytes; use std::collections::HashMap; @@ -35,7 +35,7 @@ impl Operation for SetNotificationTarget { .map_err(|e| s3_error!(InvalidArgument, "invalid query parameters: {}", e))?; let target_type = query.target_type.to_lowercase(); - if target_type != NOTIFY_WEBHOOK_SUB_SYS.to_string() && target_type != NOTIFY_MQTT_SUB_SYS.to_string() { + if target_type != *NOTIFY_WEBHOOK_SUB_SYS && target_type != *NOTIFY_MQTT_SUB_SYS { return Err(s3_error!(InvalidArgument, "unsupported target type: {}", query.target_type)); } diff --git a/rustfs/src/main.rs b/rustfs/src/main.rs index 770554b1..34f907d0 100644 --- a/rustfs/src/main.rs +++ b/rustfs/src/main.rs @@ -151,7 +151,6 @@ async fn run(opt: config::Opt) -> Result<()> { eps.drives_per_set ); - // Add warning for host with multiple drives in a set (similar to RustFS) if eps.drives_per_set > 1 { warn!("WARNING: Host local has more than 0 drives of set. A host failure will result in data becoming unavailable."); }