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, 4 deletions

diff --git a/crates/shirabe/src/json/json_file.rs b/crates/shirabe/src/json/json_file.rs
index e31cd70d..040f472a 100644
--- a/crates/shirabe/src/json/json_file.rs
+++ b/crates/shirabe/src/json/json_file.rs
@@ -8,8 +8,7 @@ use crate::json::JsonValidationException;
 use crate::util::Filesystem;
 use crate::util::HttpDownloader;
 use crate::util::Silencer;
-use indexmap::IndexMap;
-use shirabe_pcre::{CaptureKey, Preg};
+use shirabe_pcre::{CaptureKey, Preg, PregMatchedGroups};
 use shirabe_php_shim::Catch as _;
 use shirabe_php_shim::{
     InvalidArgumentException, JSON_PRETTY_PRINT, JSON_UNESCAPED_SLASHES, JSON_UNESCAPED_UNICODE,
@@ -451,7 +450,7 @@ impl JsonFile {
             let indent_owned = options.indent;
             return Ok(Preg::replace_callback(
                 php_regex!(r"#^ {4,}#m"),
-                move |m: &indexmap::IndexMap<shirabe_pcre::CaptureKey, String>| -> String {
+                move |m: &shirabe_pcre::PregMatchedGroups| -> String {
                     let whole = m
                         .get(&shirabe_pcre::CaptureKey::ByIndex(0))
                         .map(|s| s.as_str())
@@ -555,7 +554,7 @@ impl JsonFile {
     }
 
     pub fn detect_indenting(json: Option<&str>) -> String {
-        let mut m: IndexMap<CaptureKey, String> = IndexMap::new();
+        let mut m = PregMatchedGroups::new();
         if Preg::is_match3(
             php_regex!(r##"#^([ \t]+)"#m"##),
             json.unwrap_or(""),