fix

crates/notify/src/rules/config.rs

@@ -39,7 +39,7 @@ impl BucketNotificationConfig {
 
     /// Parses notification configuration from XML.
     /// `arn_list` is a list of valid ARN strings for validation.
-    pub fn from_xml<R: Read>(
+    pub fn from_xml<R: Read + std::io::BufRead>(
         reader: R,
         current_region: &str,
         arn_list: &[String],
@@ -72,11 +72,7 @@ impl BucketNotificationConfig {
     /// However, Go's Config has a Validate method.
     /// The primary validation now happens during `from_xml` via `NotificationConfiguration::validate`.
     /// This method could re-check against an updated arn_list or region if needed.
-    pub fn validate(
-        &self,
-        current_region: &str,
-        arn_list: &[String],
-    ) -> Result<(), BucketNotificationConfigError> {
+    pub fn validate(&self, current_region: &str, arn_list: &[String]) -> Result<(), BucketNotificationConfigError> {
         if self.region != current_region {
             return Err(BucketNotificationConfigError::RegionMismatch {
                 config_region: self.region.clone(),
@@ -93,9 +89,7 @@ impl BucketNotificationConfig {
                     // Construct the ARN string for this target_id and self.region
                     let arn_to_check = target_id.to_arn(&self.region); // Assuming TargetID has to_arn
                     if !arn_list.contains(&arn_to_check.to_arn_string()) {
-                        return Err(BucketNotificationConfigError::ArnNotFound(
-                            arn_to_check.to_arn_string(),
-                        ));
+                        return Err(BucketNotificationConfigError::ArnNotFound(arn_to_check.to_arn_string()));
                     }
                 }
             }

crates/notify/src/rules/rules_map.rs

@@ -22,12 +22,7 @@ impl RulesMap {
     /// target_id: Notify the target.
     ///
     /// This method expands the composite event name.
-    pub fn add_rule_config(
-        &mut self,
-        event_names: &[EventName],
-        pattern: String,
-        target_id: TargetID,
-    ) {
+    pub fn add_rule_config(&mut self, event_names: &[EventName], pattern: String, target_id: TargetID) {
         let mut effective_pattern = pattern;
         if effective_pattern.is_empty() {
             effective_pattern = "*".to_string(); // Match all by default
@@ -55,8 +50,7 @@ impl RulesMap {
         }
     }
 
-    /// 从当前 RulesMap 中移除另一个 RulesMap 中定义的规则。
-    /// 对应 Go 的 `RulesMap.Remove(rulesMap2 RulesMap)`
+    /// Remove another rule defined in the RulesMap from the current RulesMap.
     pub fn remove_map(&mut self, other_map: &Self) {
         let mut events_to_remove = Vec::new();
         for (event_name, self_pattern_rules) in &mut self.map {
@@ -72,24 +66,24 @@ impl RulesMap {
         }
     }
 
-    /// 匹配给定事件名称和对象键的规则，返回所有匹配的 TargetID。
+    ///Rules matching the given event name and object key, returning all matching TargetIDs.
     pub fn match_rules(&self, event_name: EventName, object_key: &str) -> TargetIdSet {
-        // 首先尝试直接匹配事件名称
+        // First try to directly match the event name
         if let Some(pattern_rules) = self.map.get(&event_name) {
             let targets = pattern_rules.match_targets(object_key);
             if !targets.is_empty() {
                 return targets;
             }
         }
-        // Go 的 RulesMap[eventName] 直接获取，如果不存在则为空 Rules。
-        // Rust 的 HashMap::get 返回 Option。如果事件名不存在，则没有规则。
-        // 复合事件（如 ObjectCreatedAll）在 add_rule_config 时已展开为单一事件。
-        // 因此，查询时应使用单一事件名称。
-        // 如果 event_name 本身就是单一类型，则直接查找。
-        // 如果 event_name 是复合类型，Go 的逻辑是在添加时展开。
-        // 这里的 match_rules 应该接收已经可能是单一的事件。
-        // 如果调用者传入的是复合事件，它应该先自行展开或此函数处理。
-        // 假设 event_name 已经是具体的、可用于查找的事件。
+        // Go's RulesMap[eventName] is directly retrieved, and if it does not exist, it is empty Rules.
+        // Rust's HashMap::get returns Option. If the event name does not exist, there is no rule.
+        // Compound events (such as ObjectCreatedAll) have been expanded as a single event when add_rule_config.
+        // Therefore, a single event name should be used when querying.
+        // If event_name itself is a single type, look it up directly.
+        // If event_name is a compound type, Go's logic is expanded when added.
+        // Here match_rules should receive events that may already be single.
+        // If the caller passes in a compound event, it should expand itself or handle this function first.
+        // Assume that event_name is already a specific event that can be used for searching.
         self.map
             .get(&event_name)
             .map_or_else(TargetIdSet::new, |pr| pr.match_targets(object_key))
@@ -99,7 +93,7 @@ impl RulesMap {
         self.map.is_empty()
     }
 
-    /// 返回内部规则的克隆，用于 BucketNotificationConfig::validate 等场景。
+    /// Returns a clone of internal rules for use in scenarios such as BucketNotificationConfig::validate.
     pub fn inner(&self) -> &HashMap<EventName, PatternRules> {
         &self.map
     }

crates/notify/src/rules/xml_config.rs

@@ -9,7 +9,7 @@ use thiserror::Error;
 #[derive(Debug, Error)]
 pub enum ParseConfigError {
     #[error("XML parsing error:{0}")]
-    XmlError(#[from] quick_xml::errors::Error),
+    XmlError(#[from] quick_xml::errors::serialize::DeError),
     #[error("Invalid filter value:{0}")]
     InvalidFilterValue(String),
     #[error("Invalid filter name: {0}, only 'prefix' or 'suffix' is allowed")]
@@ -193,10 +193,10 @@ impl QueueConfig {
 pub struct LambdaConfigDetail {
     #[serde(rename = "CloudFunction")]
     pub arn: String,
-    // 根据 AWS S3 文档，<CloudFunctionConfiguration> 通常还包含 Id, Event, Filter
-    // 但为了严格对应提供的 Go `lambda` 结构体，这里只包含 ARN。
-    // 如果需要完整支持，可以添加其他字段。
-    // 例如：
+    // According to AWS S3 documentation, <CloudFunctionConfiguration> usually also contains Id, Event, Filter
+    // But in order to strictly correspond to the Go `lambda` structure provided, only ARN is included here.
+    // If full support is required, additional fields can be added.
+    // For example:
     // #[serde(rename = "Id", skip_serializing_if = "Option::is_none")]
     // pub id: Option<String>,
     // #[serde(rename = "Event", default, skip_serializing_if = "Vec::is_empty")]
@@ -211,7 +211,7 @@ pub struct LambdaConfigDetail {
 pub struct TopicConfigDetail {
     #[serde(rename = "Topic")]
     pub arn: String,
-    // 类似于 LambdaConfigDetail，可以根据需要扩展以包含 Id, Event, Filter 等字段。
+    // Similar to LambdaConfigDetail, it can be extended to include fields such as Id, Event, Filter, etc.
 }
 
 #[derive(Debug, Serialize, Deserialize, Clone, Default, PartialEq, Eq)]
@@ -236,8 +236,8 @@ pub struct NotificationConfiguration {
 }
 
 impl NotificationConfiguration {
-    pub fn from_reader<R: Read>(reader: R) -> Result<Self, ParseConfigError> {
-        let config: NotificationConfiguration = quick_xml::reader::Reader::from_reader(reader)?;
+    pub fn from_reader<R: Read + std::io::BufRead>(reader: R) -> Result<Self, ParseConfigError> {
+        let config: NotificationConfiguration = quick_xml::de::from_reader(reader)?;
         Ok(config)
     }
 
@@ -268,7 +268,7 @@ impl NotificationConfiguration {
         if self.xmlns.is_none() {
             self.xmlns = Some("http://s3.amazonaws.com/doc/2006-03-01/".to_string());
         }
-        // 注意：如果 LambdaConfigDetail 和 TopicConfigDetail 将来包含区域等信息，
-        // 也可能需要在这里设置默认值。但根据当前定义，它们只包含 ARN 字符串。
+        // Note: If LambdaConfigDetail and TopicConfigDetail contain information such as regions in the future,
+        // You may also need to set the default value here. But according to the current definition, they only contain ARN strings.
     }
 }