From 52a0665acbbe5bf5b8c6875118fb9cdf7952453b Mon Sep 17 00:00:00 2001 From: nsfisis Date: Mon, 17 Aug 2026 06:43:52 +0900 Subject: 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 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. --- crates/shirabe-symfony-console/src/input/string_input.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'crates/shirabe-symfony-console/src/input/string_input.rs') diff --git a/crates/shirabe-symfony-console/src/input/string_input.rs b/crates/shirabe-symfony-console/src/input/string_input.rs index d6794957..245b948d 100644 --- a/crates/shirabe-symfony-console/src/input/string_input.rs +++ b/crates/shirabe-symfony-console/src/input/string_input.rs @@ -6,7 +6,7 @@ use crate::input::InputDefinition; use crate::input::InputInterface; use crate::input::StreamableInputInterface; use indexmap::IndexMap; -use shirabe_php_shim::{CaptureKey, PhpMixed, php_regex, preg_match2}; +use shirabe_php_shim::{CaptureKey, PhpMixed, PregMatches, php_regex, preg_match2}; /// StringInput represents an input provided as a string. /// @@ -57,7 +57,7 @@ impl StringInput { continue; } - let mut m: IndexMap> = IndexMap::new(); + let mut m = PregMatches::new(); if preg_match2(php_regex!(r"/\s+/A"), input, &mut m, cursor as usize) { if token.is_some() { tokens.push(token.take().unwrap()); -- cgit v1.3.1-4-g156e