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/src/repository/vcs/hg_driver.rs b/crates/shirabe/src/repository/vcs/hg_driver.rs
index f4e02685..d617099e 100644
--- a/crates/shirabe/src/repository/vcs/hg_driver.rs
+++ b/crates/shirabe/src/repository/vcs/hg_driver.rs
@@ -11,7 +11,7 @@ use crate::util::Hg as HgUtils;
 use crate::util::Url;
 use chrono::{DateTime, FixedOffset, Utc};
 use indexmap::IndexMap;
-use shirabe_pcre::{CaptureKey, Preg};
+use shirabe_pcre::{CaptureKey, Preg, PregMatchedGroups};
 use shirabe_php_shim::Catch as _;
 use shirabe_php_shim::{PhpMixed, RuntimeException, dirname, is_dir, is_writable, php_regex};
 
@@ -233,7 +233,7 @@ impl HgDriver {
             );
             for tag in self.inner.process.borrow().split_lines(&output) {
                 if !tag.is_empty() {
-                    let mut m: IndexMap<CaptureKey, String> = IndexMap::new();
+                    let mut m = PregMatchedGroups::new();
                     if Preg::match3(php_regex!(r"(^([^\s]+)\s+\d+:(.*)$)"), &tag, Some(&mut m)) {
                         tags.insert(
                             m.get(&CaptureKey::ByIndex(1)).cloned().unwrap_or_default(),
@@ -263,7 +263,7 @@ impl HgDriver {
             );
             for branch in self.inner.process.borrow().split_lines(&output) {
                 if !branch.is_empty() {
-                    let mut m: IndexMap<CaptureKey, String> = IndexMap::new();
+                    let mut m = PregMatchedGroups::new();
                     if Preg::match3(
                         php_regex!(r"(^([^\s]+)\s+\d+:([a-f0-9]+))"),
                         &branch,
@@ -288,7 +288,7 @@ impl HgDriver {
             );
             for branch in self.inner.process.borrow().split_lines(&output) {
                 if !branch.is_empty() {
-                    let mut m: IndexMap<CaptureKey, String> = IndexMap::new();
+                    let mut m = PregMatchedGroups::new();
                     if Preg::match3(
                         php_regex!(r"(^(?:[\s*]*)([^\s]+)\s+\d+:(.*)$)"),
                         &branch,