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/gitlab_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/gitlab_driver.rs')
| -rw-r--r-- | crates/shirabe/src/repository/vcs/gitlab_driver.rs | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/crates/shirabe/src/repository/vcs/gitlab_driver.rs b/crates/shirabe/src/repository/vcs/gitlab_driver.rs index 1887ddc4..5494feed 100644 --- a/crates/shirabe/src/repository/vcs/gitlab_driver.rs +++ b/crates/shirabe/src/repository/vcs/gitlab_driver.rs @@ -91,27 +91,26 @@ impl GitLabDriver { let guessed_domain = match_ .get(&CaptureKey::ByName("domain".to_string())) - .cloned() .filter(|s| !s.is_empty()) + .map(str::to_string) .unwrap_or_else(|| { match_ .get(&CaptureKey::ByName("domain2".to_string())) - .cloned() .unwrap_or_default() + .to_string() }); let configured_domains = self.inner.config.borrow_mut().get("gitlab-domains"); let mut url_parts: Vec<String> = explode( "/", - &match_ + match_ .get(&CaptureKey::ByName("parts".to_string())) - .cloned() .unwrap_or_default(), ); let scheme_match = match_ .get(&CaptureKey::ByName("scheme".to_string())) - .cloned() - .unwrap_or_default(); + .unwrap_or_default() + .to_string(); self.scheme = if matches!(scheme_match.as_str(), "https" | "http") { scheme_match } else if self @@ -125,7 +124,9 @@ impl GitLabDriver { } else { "https".to_string() }; - let port = match_.get(&CaptureKey::ByName("port".to_string())).cloned(); + let port = match_ + .get(&CaptureKey::ByName("port".to_string())) + .map(str::to_string); let origin = Self::determine_origin(&configured_domains, guessed_domain, &mut url_parts, port); let origin = match origin { @@ -169,9 +170,8 @@ impl GitLabDriver { self.repository = Preg::replace( php_regex!(r"#(\.git)$#"), "", - &match_ + match_ .get(&CaptureKey::ByName("repo".to_string())) - .cloned() .unwrap_or_default(), ); @@ -950,23 +950,22 @@ impl GitLabDriver { let scheme = match_ .get(&CaptureKey::ByName("scheme".to_string())) - .cloned() - .unwrap_or_default(); + .unwrap_or_default() + .to_string(); let guessed_domain = match_ .get(&CaptureKey::ByName("domain".to_string())) - .cloned() .filter(|s| !s.is_empty()) + .map(str::to_string) .unwrap_or_else(|| { match_ .get(&CaptureKey::ByName("domain2".to_string())) - .cloned() .unwrap_or_default() + .to_string() }); let mut url_parts: Vec<String> = explode( "/", - &match_ + match_ .get(&CaptureKey::ByName("parts".to_string())) - .cloned() .unwrap_or_default(), ); @@ -974,7 +973,9 @@ impl GitLabDriver { &config.borrow().get("gitlab-domains"), guessed_domain, &mut url_parts, - match_.get(&CaptureKey::ByName("port".to_string())).cloned(), + match_ + .get(&CaptureKey::ByName("port".to_string())) + .map(str::to_string), ) .is_none() { @@ -1013,8 +1014,8 @@ impl GitLabDriver { return Some( match_ .get(&CaptureKey::ByIndex(1)) - .cloned() - .unwrap_or_default(), + .unwrap_or_default() + .to_string(), ); } } |
