diff options
| author | nsfisis <nsfisis@gmail.com> | 2026-08-18 01:57:02 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2026-08-18 01:57:02 +0900 |
| commit | 844097edf44bf1424d28e2d5fbefda90c1c8f46c (patch) | |
| tree | 968767db86e26acb022dd6ec5ac2c602d92e3708 /crates/shirabe/src/repository/vcs/svn_driver.rs | |
| parent | 5114a8199a87c9e5584d92848e95deba22b73e98 (diff) | |
| download | php-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/repository/vcs/svn_driver.rs')
| -rw-r--r-- | crates/shirabe/src/repository/vcs/svn_driver.rs | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/crates/shirabe/src/repository/vcs/svn_driver.rs b/crates/shirabe/src/repository/vcs/svn_driver.rs index 05380a17..9426e1f3 100644 --- a/crates/shirabe/src/repository/vcs/svn_driver.rs +++ b/crates/shirabe/src/repository/vcs/svn_driver.rs @@ -321,7 +321,10 @@ impl SvnDriver { && let Some(m) = Preg::is_match3(php_regex!(r"{^Last Changed Date: ([^(]+)}"), &line) { - let date_str = m.get(&CaptureKey::ByIndex(1)).cloned().unwrap_or_default(); + let date_str = m + .get(&CaptureKey::ByIndex(1)) + .unwrap_or_default() + .to_string(); return Ok(shirabe_php_shim::date_create::<Utc>(date_str.trim()) .ok() .map(|d| d.fixed_offset())); @@ -353,7 +356,10 @@ impl SvnDriver { .get(&CaptureKey::ByIndex(1)) .and_then(|s| s.parse().ok()) .unwrap_or(0); - let path = m.get(&CaptureKey::ByIndex(2)).cloned().unwrap_or_default(); + let path = m + .get(&CaptureKey::ByIndex(2)) + .unwrap_or_default() + .to_string(); if path == "./" { last_rev = rev; } else { @@ -399,7 +405,10 @@ impl SvnDriver { .get(&CaptureKey::ByIndex(1)) .and_then(|s| s.parse().ok()) .unwrap_or(0); - let path = m.get(&CaptureKey::ByIndex(2)).cloned().unwrap_or_default(); + let path = m + .get(&CaptureKey::ByIndex(2)) + .unwrap_or_default() + .to_string(); if path == "./" { let identifier = self.build_identifier( &format!("/{}", self.trunk_path.clone().unwrap_or_default()), @@ -437,7 +446,10 @@ impl SvnDriver { .get(&CaptureKey::ByIndex(1)) .and_then(|s| s.parse().ok()) .unwrap_or(0); - let path = m.get(&CaptureKey::ByIndex(2)).cloned().unwrap_or_default(); + let path = m + .get(&CaptureKey::ByIndex(2)) + .unwrap_or_default() + .to_string(); if path == "./" { last_rev = rev; } else { |
