From 78157ab3ffeca37023381a422fccda2d4a0c64af Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sun, 14 Jun 2026 04:01:45 +0900 Subject: refactor(pcre): drop strict-groups Preg variants Rust's type system already distinguishes participating from non-participating capture groups via Option, so the *StrictGroups methods add no safety here. Remove them and switch callers to the plain variants. --- crates/shirabe/src/repository/vcs/svn_driver.rs | 32 +++++++------------------ 1 file changed, 8 insertions(+), 24 deletions(-) (limited to 'crates/shirabe/src/repository/vcs/svn_driver.rs') diff --git a/crates/shirabe/src/repository/vcs/svn_driver.rs b/crates/shirabe/src/repository/vcs/svn_driver.rs index 911e982..71d8499 100644 --- a/crates/shirabe/src/repository/vcs/svn_driver.rs +++ b/crates/shirabe/src/repository/vcs/svn_driver.rs @@ -322,12 +322,8 @@ impl SvnDriver { for line in self.inner.process.borrow().split_lines(&output) { if !line.is_empty() { let mut m: IndexMap = IndexMap::new(); - if Preg::is_match_strict_groups3( - r"{^Last Changed Date: ([^(]+)}", - &line, - Some(&mut m), - ) - .unwrap_or(false) + if Preg::is_match3(r"{^Last Changed Date: ([^(]+)}", &line, Some(&mut m)) + .unwrap_or(false) { let date_str = m.get(&CaptureKey::ByIndex(1)).cloned().unwrap_or_default(); return Ok(shirabe_php_shim::date_create::(date_str.trim()) @@ -358,12 +354,8 @@ impl SvnDriver { let line = trim(&line, None); if !line.is_empty() { let mut m: IndexMap = IndexMap::new(); - if Preg::is_match_strict_groups3( - r"{^\s*(\S+).*?(\S+)\s*$}", - &line, - Some(&mut m), - ) - .unwrap_or(false) + if Preg::is_match3(r"{^\s*(\S+).*?(\S+)\s*$}", &line, Some(&mut m)) + .unwrap_or(false) { let rev: i64 = m .get(&CaptureKey::ByIndex(1)) @@ -413,12 +405,8 @@ impl SvnDriver { let line = trim(&line, None); if !line.is_empty() { let mut m: IndexMap = IndexMap::new(); - if Preg::is_match_strict_groups3( - r"{^\s*(\S+).*?(\S+)\s*$}", - &line, - Some(&mut m), - ) - .unwrap_or(false) + if Preg::is_match3(r"{^\s*(\S+).*?(\S+)\s*$}", &line, Some(&mut m)) + .unwrap_or(false) { let rev: i64 = m .get(&CaptureKey::ByIndex(1)) @@ -459,12 +447,8 @@ impl SvnDriver { let line = trim(&line, None); if !line.is_empty() { let mut m: IndexMap = IndexMap::new(); - if Preg::is_match_strict_groups3( - r"{^\s*(\S+).*?(\S+)\s*$}", - &line, - Some(&mut m), - ) - .unwrap_or(false) + if Preg::is_match3(r"{^\s*(\S+).*?(\S+)\s*$}", &line, Some(&mut m)) + .unwrap_or(false) { let rev: i64 = m .get(&CaptureKey::ByIndex(1)) -- cgit v1.3.1