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, 3 insertions, 3 deletions

diff --git a/crates/shirabe/tests/all_functional_test.rs b/crates/shirabe/tests/all_functional_test.rs
index 7d71c649..500f822e 100644
--- a/crates/shirabe/tests/all_functional_test.rs
+++ b/crates/shirabe/tests/all_functional_test.rs
@@ -8,7 +8,7 @@
 use indexmap::IndexMap;
 use serial_test::serial;
 use shirabe::util::filesystem::Filesystem;
-use shirabe_pcre::preg::Preg;
+use shirabe_pcre::preg::{Preg, PregMatchedGroups};
 use shirabe_php_shim::{CaptureKey, PhpMixed, intval, php_regex, preg_split_delim_capture};
 use std::path::{Path, PathBuf};
 
@@ -141,14 +141,14 @@ fn expect_matches(expected: &str, output: &str) {
             line += 1;
         }
         if eb[i] == b'%' {
-            let mut m: IndexMap<CaptureKey, String> = IndexMap::new();
+            let mut m = PregMatchedGroups::new();
             if !Preg::is_match3(php_regex!("{%(.+?)%}"), &expected[i..], Some(&mut m)) {
                 panic!("Failed to match %...% in {}", &expected[i..]);
             }
             let regex = m.get(&CaptureKey::ByIndex(1)).cloned().unwrap();
 
             let pattern = format!("{{{}}}", regex);
-            let mut m = IndexMap::new();
+            let mut m = PregMatchedGroups::new();
             if Preg::is_match3(&pattern, &output[j..], Some(&mut m)) {
                 let full = m.get(&CaptureKey::ByIndex(0)).cloned().unwrap();
                 i += regex.len() + 2;