aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/platform/version.rs
diff options
context:
space:
mode:
authornsfisis <nsfisis@gmail.com>2026-08-18 01:57:02 +0900
committernsfisis <nsfisis@gmail.com>2026-08-18 01:57:02 +0900
commit844097edf44bf1424d28e2d5fbefda90c1c8f46c (patch)
tree968767db86e26acb022dd6ec5ac2c602d92e3708 /crates/shirabe/src/platform/version.rs
parent5114a8199a87c9e5584d92848e95deba22b73e98 (diff)
downloadphp-shirabe-844097edf44bf1424d28e2d5fbefda90c1c8f46c.tar.gz
php-shirabe-844097edf44bf1424d28e2d5fbefda90c1c8f46c.tar.zst
php-shirabe-844097edf44bf1424d28e2d5fbefda90c1c8f46c.zip
refactor(pcre): hand back the match instead of copying it out
Preg::match4 and Preg::replace_callback gave callers a PregMatchedGroups: an IndexMap rebuilt from the match with an owned String per group, plus a second String for a named group's name key. That is the copy PregMatches shed when it started wrapping regex::Captures, reinstated one layer up -- and nearly every regex call in the tree goes through Preg rather than the shim's preg_* directly, so almost nothing saw the borrow. PregMatchedGroups existed only to drop the null (unmatched) groups the old PregMatches held as Option<String> values. PregMatches::get reports a non-participating group as None on its own, so the two read alike and the type collapses into it. Call sites still reach groups through get(&CaptureKey::ByIndex(N)); what changes is that the value arrives as a &str borrowed from the subject, which the signatures now carry as a lifetime. Three places needed the borrow reckoned with rather than a mechanical rewrite: PhpFileCleaner::clean and Problem::get_messages read their groups out before mutating what the match borrows, and Git::get_authentication_failure names the lifetime of its url argument, which the result borrows instead of self. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe/src/platform/version.rs')
-rw-r--r--crates/shirabe/src/platform/version.rs28
1 files changed, 14 insertions, 14 deletions
diff --git a/crates/shirabe/src/platform/version.rs b/crates/shirabe/src/platform/version.rs
index b89d052b..204bdccd 100644
--- a/crates/shirabe/src/platform/version.rs
+++ b/crates/shirabe/src/platform/version.rs
@@ -18,16 +18,16 @@ impl Version {
let version = matches
.get(&CaptureKey::ByName("version".to_string()))
- .cloned()
- .unwrap_or_default();
+ .unwrap_or_default()
+ .to_string();
let patch_str = matches
.get(&CaptureKey::ByName("patch".to_string()))
- .cloned()
- .unwrap_or_default();
+ .unwrap_or_default()
+ .to_string();
let suffix_str = matches
.get(&CaptureKey::ByName("suffix".to_string()))
- .cloned()
- .unwrap_or_default();
+ .unwrap_or_default()
+ .to_string();
let patch = if version_compare(&version, "3.0.0", CmpOp::Lt) {
format!(
@@ -58,12 +58,12 @@ impl Version {
let major = matches
.get(&CaptureKey::ByName("major".to_string()))
- .cloned()
- .unwrap_or_default();
+ .unwrap_or_default()
+ .to_string();
let minor = matches
.get(&CaptureKey::ByName("minor".to_string()))
- .cloned()
- .unwrap_or_default();
+ .unwrap_or_default()
+ .to_string();
Some(format!(
"{}.{}",
major,
@@ -79,12 +79,12 @@ impl Version {
let year = matches
.get(&CaptureKey::ByName("year".to_string()))
- .cloned()
- .unwrap_or_default();
+ .unwrap_or_default()
+ .to_string();
let revision = matches
.get(&CaptureKey::ByName("revision".to_string()))
- .cloned()
- .unwrap_or_default();
+ .unwrap_or_default()
+ .to_string();
Some(format!(
"{}.{}",
year,