refactor(preg): wrap the preg_* $matches maps in newtypes

The five IndexMap shapes that the preg_* functions and Preg fill in are
now distinct types generated by preg_match_map!, so a matches map no
longer interchanges with any other map of the same key and value type.

Index<usize> is kept alongside Index<&Q> because call sites such as
config_command and event_dispatcher reach for a group by its position in
the map rather than by its capture key.

1 files changed, 4 insertions, 4 deletions

diff --git a/crates/shirabe-symfony-finder/src/finder.rs b/crates/shirabe-symfony-finder/src/finder.rs
index 95ab5d50..27a7d2d6 100644
--- a/crates/shirabe-symfony-finder/src/finder.rs
+++ b/crates/shirabe-symfony-finder/src/finder.rs
@@ -8,8 +8,8 @@
 
 use crate::glob::Glob;
 use chrono::{NaiveDate, NaiveDateTime};
-use indexmap::{IndexMap, IndexSet};
-use shirabe_pcre::{CaptureKey, Preg};
+use indexmap::IndexSet;
+use shirabe_pcre::{CaptureKey, Preg, PregMatchedGroups};
 use shirabe_php_shim::{file_exists, glob, is_dir, php_regex, preg_quote, rtrim};
 use std::path::{Path, PathBuf};
 use std::time::UNIX_EPOCH;
@@ -642,7 +642,7 @@ fn is_regex(str: &str) -> bool {
     // PHP 8.2+ available modifiers.
     let available_modifiers = "imsxuADUn";
 
-    let mut matches: IndexMap<CaptureKey, String> = IndexMap::new();
+    let mut matches = PregMatchedGroups::new();
     let pattern = format!("/^(.{{3,}}?)[{available_modifiers}]*$/");
     if Preg::is_match3(&pattern, str, Some(&mut matches)) {
         let group = matches
@@ -688,7 +688,7 @@ fn comparator_test(operator: &str, test: i64, target: i64) -> bool {
 /// `DateComparator::__construct`, returning `(operator, target unix timestamp)`.
 fn parse_date_comparator(test: &str) -> (String, i64) {
     let pattern = "#^\\s*(==|!=|[<>]=?|after|since|before|until)?\\s*(.+?)\\s*$#i";
-    let mut matches: IndexMap<CaptureKey, String> = IndexMap::new();
+    let mut matches = PregMatchedGroups::new();
     if !Preg::is_match3(pattern, test, Some(&mut matches)) {
         panic!("Don't understand \"{test}\" as a date test.");
     }