✨ Add warn in ResourceNameRegexpMatcher, use find_map in Identifier

ShellWen · Mar 9, 2024 · e9bc0e9 · e9bc0e9
1 parent 3e5e55e
commit e9bc0e9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/crates/core/src/identifier.rs b/crates/core/src/identifier.rs
@@ -17,13 +17,7 @@ pub(crate) trait Identifier {
 
 impl Identifier for Vec<IdentifierEnum> {
     fn identify(&self) -> Option<NativePointer> {
-        for identifier in self {
-            let ptr = identifier.identify();
-            if ptr.is_some() {
-                return ptr;
-            }
-        }
-        None
+        self.iter().find_map(|identifier| identifier.identify())
     }
 }
 

diff --git a/crates/core/src/matcher.rs b/crates/core/src/matcher.rs
@@ -1,4 +1,5 @@
 use serde::Deserialize;
+use tracing::warn;
 
 use crate::source::Source;
 
@@ -42,7 +43,14 @@ pub struct ResourceNameRegexpMatcher {
 
 impl SourceMatcher for ResourceNameRegexpMatcher {
     fn matches(&self, source: &Source) -> bool {
-        let re = regex::Regex::new(&self.regexp).unwrap();
-        re.is_match(&source.resource_name)
+        let re = regex::Regex::new(&self.regexp);
+        match re {
+            Ok(re) => re.is_match(&source.resource_name),
+            Err(_) => {
+                warn!("Invalid regexp: {}", &self.regexp);
+                warn!("It will be ignored. Please check your config file");
+                false
+            }
+        }
     }
 }