improve code

policy/src/arn.rs

@@ -17,7 +17,7 @@ pub struct ARN {
 
 impl ARN {
     pub fn new_iam_role_arn(resource_id: &str, server_region: &str) -> Result<Self> {
-        let valid_resource_id_regex = Regex::new(r"^[A-Za-z0-9_/\.-]+$").unwrap();
+        let valid_resource_id_regex = Regex::new(r"^[A-Za-z0-9_/\.-]+$")?;
         if !valid_resource_id_regex.is_match(resource_id) {
             return Err(Error::msg("ARN resource ID invalid"));
         }
@@ -57,7 +57,7 @@ impl ARN {
             return Err(Error::msg("ARN resource type invalid"));
         }
 
-        let valid_resource_id_regex = Regex::new(r"^[A-Za-z0-9_/\.-]+$").unwrap();
+        let valid_resource_id_regex = Regex::new(r"^[A-Za-z0-9_/\.-]+$")?;
         if !valid_resource_id_regex.is_match(res[1]) {
             return Err(Error::msg("ARN resource ID invalid"));
         }

policy/src/policy/function/date.rs

@@ -39,7 +39,7 @@ impl Serialize for DateFuncValue {
             &self
                 .0
                 .format(&Rfc3339)
-                .map_err(|e| S::Error::custom(format!("format datetime failed: {e:?}")))?,
+                .map_err(|e| Error::custom(format!("format datetime failed: {e:?}")))?,
         )
     }
 }

policy/src/policy/function/key_name.rs

@@ -309,7 +309,6 @@ pub enum AwsKeyName {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::policy::Error;
     use serde::Deserialize;
     use test_case::test_case;
 
@@ -330,7 +329,7 @@ mod tests {
     #[test_case("ldap:us")]
     #[test_case("DurationSeconds")]
     fn key_name_from_str_failed(val: &str) {
-        assert_eq!(KeyName::try_from(val), Err(Error::InvalidKeyName(val.to_string())));
+        assert_eq!(KeyName::try_from(val), Err(InvalidKeyName(val.to_string())));
     }
 
     #[test_case("s3:x-amz-copy-source", KeyName::S3(S3KeyName::S3XAmzCopySource))]