refactor(rust): misc fixes & tidying

2024-04-09 21:42:59 -04:00 · 2024-04-09 21:42:59 -04:00 · abc7910381
commit abc7910381
parent 5825e24d56
23 changed files with 137 additions and 127 deletions
--- a/cli/src/generate/parse_grammar.rs
+++ b/cli/src/generate/parse_grammar.rs
@ -166,19 +166,18 @@ fn parse_rule(json: RuleJSON) -> Rule {
        RuleJSON::PATTERN { value, flags } => Rule::Pattern(
            value,
            flags.map_or(String::new(), |f| {
-                f.chars()
-                    .filter(|c| {
-                        if *c == 'i' {
-                            true
-                        } else {
-                            // silently ignore unicode flags
-                            if *c != 'u' && *c != 'v' {
-                                eprintln!("Warning: unsupported flag {c}");
-                            }
-                            false
+                f.matches(|c| {
+                    if c == 'i' {
+                        true
+                    } else {
+                        // silently ignore unicode flags
+                        if c != 'u' && c != 'v' {
+                            eprintln!("Warning: unsupported flag {c}");
                        }
-                    })
-                    .collect()
+                        false
+                    }
+                })
+                .collect()
            }),
        ),
        RuleJSON::SYMBOL { name } => Rule::NamedSymbol(name),