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

diff --git a/crates/shirabe/src/util/filesystem.rs b/crates/shirabe/src/util/filesystem.rs
index 1a9ab703..21512a81 100644
--- a/crates/shirabe/src/util/filesystem.rs
+++ b/crates/shirabe/src/util/filesystem.rs
@@ -735,8 +735,7 @@ impl Filesystem {
         }
 
         // extract a prefix being a protocol://, protocol:, protocol://drive: or simply drive:
-        let mut prefix_match: indexmap::IndexMap<shirabe_pcre::CaptureKey, String> =
-            indexmap::IndexMap::new();
+        let mut prefix_match = shirabe_pcre::PregMatchedGroups::new();
         if Preg::is_match3(
             php_regex!("{^( [0-9a-z]{2,}+: (?: // (?: [a-z]: )? )? | [a-z]: )}ix"),
             &path,
@@ -768,7 +767,7 @@ impl Filesystem {
         // ensure c: is normalized to C:
         prefix = Preg::replace_callback(
             php_regex!("{(^|://)[a-z]:$}i"),
-            |m: &indexmap::IndexMap<shirabe_pcre::CaptureKey, String>| -> String {
+            |m: &shirabe_pcre::PregMatchedGroups| -> String {
                 let s = m
                     .get(&shirabe_pcre::CaptureKey::ByIndex(0))
                     .cloned()