From 34c74255d781ad0a0bf7cc5ad4ec1761bef61e04 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Tue, 18 Aug 2026 01:57:02 +0900 Subject: refactor(pcre): drop the two bespoke isMatch variants is_match_named and is_match_with_indexed_captures reshaped a match into a name-keyed map or a number-positioned vec, each allocating a String per group up front for callers that then read one or two of them. Every one of the eleven call sites ports a plain Preg::isMatch in PHP, so they now call is_match3 and reach for the group they want through get(&CaptureKey::ByIndex(N)) / get(&CaptureKey::ByName(..)), the same way the rest of the tree already reads a match. Falling out of that: PregNamedGroups existed only to type the first variant; PregMatches::iter() only to build both; and PregMatches::pattern only to give iter() the capture names. PregMatches is now a plain wrapper over regex::Captures, so preg_replace_callback no longer clones the resolved pattern for every match, and preg_match_map! is internal to the shim again. SvnDriver::get_file_content and get_change_date recover the flat `isMatch(..) && $match[2] !== null` condition the PHP has, which the vec shape had forced into a nested if. Co-Authored-By: Claude Opus 5 (1M context) --- crates/shirabe/src/package/version/version_guesser.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'crates/shirabe/src/package/version') diff --git a/crates/shirabe/src/package/version/version_guesser.rs b/crates/shirabe/src/package/version/version_guesser.rs index daa25361..a01bf469 100644 --- a/crates/shirabe/src/package/version/version_guesser.rs +++ b/crates/shirabe/src/package/version/version_guesser.rs @@ -707,12 +707,12 @@ impl VersionGuesser { trunk_path, branches_path, tags_path, ); - if let Some(matches) = Preg::is_match_with_indexed_captures(&url_pattern, &output) { - let m1 = matches[1].clone().unwrap_or_default(); - let m2 = matches[2].clone(); - let m3 = matches[3].clone(); - if let Some(m2) = m2.as_ref() - && let Some(m3) = m3.as_ref() + if let Some(matches) = Preg::is_match3(&url_pattern, &output) { + let m1 = matches.get(&CaptureKey::ByIndex(1)).unwrap_or_default(); + let m2 = matches.get(&CaptureKey::ByIndex(2)); + let m3 = matches.get(&CaptureKey::ByIndex(3)); + if let Some(m2) = m2 + && let Some(m3) = m3 && (branches_path == *m2 || tags_path == *m2) { // we are in a branches path @@ -728,8 +728,8 @@ impl VersionGuesser { })); } - assert!(is_string(&PhpMixed::String(m1.clone()))); - let pretty_version = trim(&m1, None); + assert!(is_string(&PhpMixed::String(m1.to_string()))); + let pretty_version = trim(m1, None); let version = if pretty_version == "trunk" { "dev-trunk".to_string() } else { -- cgit v1.3.1-4-g156e