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.

9 files changed, 54 insertions, 100 deletions

diff --git a/crates/shirabe/src/repository/composer_repository.rs b/crates/shirabe/src/repository/composer_repository.rs
index f07eb73..5994968 100644
--- a/crates/shirabe/src/repository/composer_repository.rs
+++ b/crates/shirabe/src/repository/composer_repository.rs
@@ -792,7 +792,7 @@ impl ComposerRepository {
         if self.has_providers()? || self.lazy_providers_url.is_some() {
             // optimize search for "^foo/bar" where at least "^foo/" is present by loading this directly from the listUrl if present
             let mut match_groups: IndexMap<CaptureKey, String> = IndexMap::new();
-            if Preg::is_match_strict_groups3(
+            if Preg::is_match3(
                 r"{^\^(?P<query>(?P<vendor>[a-z0-9_.-]+)/[a-z0-9_.-]*)\*?$}i",
                 &query,
                 Some(&mut match_groups),
diff --git a/crates/shirabe/src/repository/platform_repository.rs b/crates/shirabe/src/repository/platform_repository.rs
index d9954af..39e29fb 100644
--- a/crates/shirabe/src/repository/platform_repository.rs
+++ b/crates/shirabe/src/repository/platform_repository.rs
@@ -369,7 +369,7 @@ impl PlatformRepository {
 
                     // AMQP protocol version => 0-9-1
                     let mut protocol_matches: IndexMap<CaptureKey, String> = IndexMap::new();
-                    if Preg::is_match_strict_groups3(
+                    if Preg::is_match3(
                         "/^AMQP protocol version => (?<version>.+)$/im",
                         &info,
                         Some(&mut protocol_matches),
@@ -434,7 +434,7 @@ impl PlatformRepository {
 
                     // SSL Version => OpenSSL/1.0.1t
                     let mut ssl_matches: IndexMap<CaptureKey, String> = IndexMap::new();
-                    if Preg::is_match_strict_groups3(
+                    if Preg::is_match3(
                         "{^SSL Version => (?<library>[^/]+)/(?<version>.+)$}im",
                         &info,
                         Some(&mut ssl_matches),
@@ -506,7 +506,7 @@ impl PlatformRepository {
 
                     // libSSH Version => libssh2/1.4.3
                     let mut ssh_matches: IndexMap<CaptureKey, String> = IndexMap::new();
-                    if Preg::is_match_strict_groups3(
+                    if Preg::is_match3(
                         "{^libSSH Version => (?<library>[^/]+)/(?<version>.+?)(?:/.*)?$}im",
                         &info,
                         Some(&mut ssh_matches),
@@ -533,7 +533,7 @@ impl PlatformRepository {
 
                     // ZLib Version => 1.2.8
                     let mut zlib_matches: IndexMap<CaptureKey, String> = IndexMap::new();
-                    if Preg::is_match_strict_groups3(
+                    if Preg::is_match3(
                         "{^ZLib Version => (?<version>.+)$}im",
                         &info,
                         Some(&mut zlib_matches),
@@ -558,7 +558,7 @@ impl PlatformRepository {
 
                     // timelib version => 2018.03
                     let mut timelib_matches: IndexMap<CaptureKey, String> = IndexMap::new();
-                    if Preg::is_match_strict_groups3(
+                    if Preg::is_match3(
                         "/^timelib version => (?<version>.+)$/im",
                         &info,
                         Some(&mut timelib_matches),
@@ -579,7 +579,7 @@ impl PlatformRepository {
 
                     // Timezone Database => internal
                     let mut zoneinfo_source_matches: IndexMap<CaptureKey, String> = IndexMap::new();
-                    if Preg::is_match_strict_groups3(
+                    if Preg::is_match3(
                         "/^Timezone Database => (?<source>internal|external)$/im",
                         &info,
                         Some(&mut zoneinfo_source_matches),
@@ -591,11 +591,9 @@ impl PlatformRepository {
                             .map(|s| s == "external")
                             .unwrap_or(false);
                         let mut zoneinfo_matches: IndexMap<CaptureKey, String> = IndexMap::new();
-                        if Preg::is_match_strict_groups3(
-                            "/^\"Olson\" Timezone Database Version => (?<version>.+?)(?:\\.system)?$/im",
-                            &info,
-                            Some(&mut zoneinfo_matches),
-                        )
+                        if Preg::is_match3("/^\"Olson\" Timezone Database Version => (?<version>.+?)(?:\\.system)?$/im",
+                        &info,
+                        Some(&mut zoneinfo_matches),)
                         .unwrap_or(false)
                         {
                             let zoneinfo_version = zoneinfo_matches
@@ -671,7 +669,7 @@ impl PlatformRepository {
                     let info = self.runtime.get_extension_info(name)?;
 
                     let mut libjpeg_matches: IndexMap<CaptureKey, String> = IndexMap::new();
-                    if Preg::is_match_strict_groups3(
+                    if Preg::is_match3(
                         "/^libJPEG Version => (?<version>.+?)(?: compatible)?$/im",
                         &info,
                         Some(&mut libjpeg_matches),
@@ -694,7 +692,7 @@ impl PlatformRepository {
                     }
 
                     let mut libpng_matches: IndexMap<CaptureKey, String> = IndexMap::new();
-                    if Preg::is_match_strict_groups3(
+                    if Preg::is_match3(
                         "/^libPNG Version => (?<version>.+)$/im",
                         &info,
                         Some(&mut libpng_matches),
@@ -714,7 +712,7 @@ impl PlatformRepository {
                     }
 
                     let mut freetype_matches: IndexMap<CaptureKey, String> = IndexMap::new();
-                    if Preg::is_match_strict_groups3(
+                    if Preg::is_match3(
                         "/^FreeType Version => (?<version>.+)$/im",
                         &info,
                         Some(&mut freetype_matches),
@@ -734,7 +732,7 @@ impl PlatformRepository {
                     }
 
                     let mut libxpm_matches: IndexMap<CaptureKey, String> = IndexMap::new();
-                    if Preg::is_match_strict_groups3(
+                    if Preg::is_match3(
                         "/^libXpm Version => (?<versionId>\\d+)$/im",
                         &info,
                         Some(&mut libxpm_matches),
@@ -832,7 +830,7 @@ impl PlatformRepository {
 
                     // ICU TZData version => 2019c
                     let mut zoneinfo_matches: IndexMap<CaptureKey, String> = IndexMap::new();
-                    if Preg::is_match_strict_groups3(
+                    if Preg::is_match3(
                         "/^ICU TZData version => (?<version>.*)$/im",
                         &info,
                         Some(&mut zoneinfo_matches),
@@ -951,13 +949,13 @@ impl PlatformRepository {
 
                     let mut matches: IndexMap<CaptureKey, String> = IndexMap::new();
                     let mut vendor_matches: IndexMap<CaptureKey, String> = IndexMap::new();
-                    if Preg::is_match_strict_groups3(
+                    if Preg::is_match3(
                         "/^Vendor Version => (?<versionId>\\d+)$/im",
                         &info,
                         Some(&mut matches),
                     )
                     .unwrap_or(false)
-                        && Preg::is_match_strict_groups3(
+                        && Preg::is_match3(
                             "/^Vendor Name => (?<vendor>.+)$/im",
                             &info,
                             Some(&mut vendor_matches),
@@ -1106,7 +1104,7 @@ impl PlatformRepository {
                     };
                     // OpenSSL 1.1.1g  21 Apr 2020
                     let mut matches: IndexMap<CaptureKey, String> = IndexMap::new();
-                    if Preg::is_match_strict_groups3(
+                    if Preg::is_match3(
                         "{^(?:OpenSSL|LibreSSL)?\\s*(?<version>\\S+)}i",
                         &openssl_text_str,
                         Some(&mut matches),
@@ -1149,7 +1147,7 @@ impl PlatformRepository {
 
                     // PCRE Unicode Version => 12.1.0
                     let mut pcre_unicode_matches: IndexMap<CaptureKey, String> = IndexMap::new();
-                    if Preg::is_match_strict_groups3(
+                    if Preg::is_match3(
                         "/^PCRE Unicode Version => (?<version>.+)$/im",
                         &info,
                         Some(&mut pcre_unicode_matches),
@@ -1173,7 +1171,7 @@ impl PlatformRepository {
                     let info = self.runtime.get_extension_info(name)?;
 
                     let mut matches: IndexMap<CaptureKey, String> = IndexMap::new();
-                    if Preg::is_match_strict_groups3(
+                    if Preg::is_match3(
                         "/^(?:Client API version|Version) => mysqlnd (?<version>.+?) /mi",
                         &info,
                         Some(&mut matches),
@@ -1197,7 +1195,7 @@ impl PlatformRepository {
                     let info = self.runtime.get_extension_info(name)?;
 
                     let mut libmongoc_matches: IndexMap<CaptureKey, String> = IndexMap::new();
-                    if Preg::is_match_strict_groups3(
+                    if Preg::is_match3(
                         "/^libmongoc bundled version => (?<version>.+)$/im",
                         &info,
                         Some(&mut libmongoc_matches),
@@ -1217,7 +1215,7 @@ impl PlatformRepository {
                     }
 
                     let mut libbson_matches: IndexMap<CaptureKey, String> = IndexMap::new();
-                    if Preg::is_match_strict_groups3(
+                    if Preg::is_match3(
                         "/^libbson bundled version => (?<version>.+)$/im",
                         &info,
                         Some(&mut libbson_matches),
@@ -1737,7 +1735,7 @@ impl PlatformRepository {
             Err(_) => {
                 extra_description = Some(format!(" (actual version: {})", pretty_version));
                 let mut m: IndexMap<CaptureKey, String> = IndexMap::new();
-                if Preg::is_match_strict_groups3(
+                if Preg::is_match3(
                     "{^(\\d+\\.\\d+\\.\\d+(?:\\.\\d+)?)}",
                     &pretty_version,
                     Some(&mut m),
diff --git a/crates/shirabe/src/repository/vcs/forgejo_driver.rs b/crates/shirabe/src/repository/vcs/forgejo_driver.rs
index 73975cd..82794a4 100644
--- a/crates/shirabe/src/repository/vcs/forgejo_driver.rs
+++ b/crates/shirabe/src/repository/vcs/forgejo_driver.rs
@@ -605,9 +605,7 @@ impl ForgejoDriver {
         let links = explode(",", &header);
         for link in links {
             let mut m: IndexMap<CaptureKey, String> = IndexMap::new();
-            if Preg::match_strict_groups3(r#"{<(.+?)>; *rel="next"}"#, &link, Some(&mut m))
-                .unwrap_or(false)
-            {
+            if Preg::match3(r#"{<(.+?)>; *rel="next"}"#, &link, Some(&mut m)).unwrap_or(false) {
                 if let Some(url) = m.get(&CaptureKey::ByIndex(1)) {
                     return Some(url.clone());
                 }
diff --git a/crates/shirabe/src/repository/vcs/git_bitbucket_driver.rs b/crates/shirabe/src/repository/vcs/git_bitbucket_driver.rs
index 9c285e0..674f849 100644
--- a/crates/shirabe/src/repository/vcs/git_bitbucket_driver.rs
+++ b/crates/shirabe/src/repository/vcs/git_bitbucket_driver.rs
@@ -87,7 +87,7 @@ impl GitBitbucketDriver {
     /// @inheritDoc
     pub fn initialize(&mut self) -> Result<()> {
         let mut m: indexmap::IndexMap<CaptureKey, String> = indexmap::IndexMap::new();
-        if !Preg::is_match_strict_groups3(
+        if !Preg::is_match3(
             r"#^https?://bitbucket\.org/([^/]+)/([^/]+?)(?:\.git|/?)?$#i",
             &self.inner.url,
             Some(&mut m),
diff --git a/crates/shirabe/src/repository/vcs/git_driver.rs b/crates/shirabe/src/repository/vcs/git_driver.rs
index 7f8c206..10353f3 100644
--- a/crates/shirabe/src/repository/vcs/git_driver.rs
+++ b/crates/shirabe/src/repository/vcs/git_driver.rs
@@ -215,9 +215,7 @@ impl GitDriver {
                 for branch in &branches {
                     if !branch.is_empty() {
                         let mut caps: IndexMap<CaptureKey, String> = IndexMap::new();
-                        if Preg::match_strict_groups3(r"{^\* +(\S+)}", branch, Some(&mut caps))
-                            .unwrap_or(false)
-                        {
+                        if Preg::match3(r"{^\* +(\S+)}", branch, Some(&mut caps)).unwrap_or(false) {
                             if let Some(name) = caps.get(&CaptureKey::ByIndex(1)) {
                                 self.root_identifier = Some(name.clone());
                                 break;
@@ -336,7 +334,7 @@ impl GitDriver {
             for tag in self.inner.process.borrow().split_lines(&output) {
                 if !tag.is_empty() {
                     let mut caps: IndexMap<CaptureKey, String> = IndexMap::new();
-                    if Preg::match_strict_groups3(
+                    if Preg::match3(
                         r"{^([a-f0-9]{40}) refs/tags/(\S+?)(\^\{\})?$}",
                         &tag,
                         Some(&mut caps),
@@ -381,7 +379,7 @@ impl GitDriver {
                     && !Preg::is_match(r"{^ *[^/]+/HEAD }", &branch).unwrap_or(false)
                 {
                     let mut caps: IndexMap<CaptureKey, String> = IndexMap::new();
-                    if Preg::match_strict_groups3(
+                    if Preg::match3(
                         r"{^(?:\* )? *(\S+) *([a-f0-9]+)(?: .*)?$}",
                         &branch,
                         Some(&mut caps),
diff --git a/crates/shirabe/src/repository/vcs/github_driver.rs b/crates/shirabe/src/repository/vcs/github_driver.rs
index 5fb3439..64ed4d3 100644
--- a/crates/shirabe/src/repository/vcs/github_driver.rs
+++ b/crates/shirabe/src/repository/vcs/github_driver.rs
@@ -74,7 +74,7 @@ impl GitHubDriver {
 
     pub fn initialize(&mut self) -> Result<()> {
         let mut match_: IndexMap<CaptureKey, String> = IndexMap::new();
-        if !Preg::is_match_strict_groups3(
+        if !Preg::is_match3(
             r"#^(?:(?:https?|git)://([^/]+)/|git@([^:]+):/?)([^/]+)/([^/]+?)(?:\.git|/)?$#",
             &self.inner.url,
             Some(&mut match_),
@@ -504,9 +504,7 @@ impl GitHubDriver {
         for line in Preg::split(r"{\r?\n}", &funding).unwrap_or_default() {
             let line = trim(&line, None);
             let mut m: IndexMap<CaptureKey, String> = IndexMap::new();
-            if Preg::is_match_strict_groups3(r"{^(\w+)\s*:\s*(.+)$}", &line, Some(&mut m))
-                .unwrap_or(false)
-            {
+            if Preg::is_match3(r"{^(\w+)\s*:\s*(.+)$}", &line, Some(&mut m)).unwrap_or(false) {
                 let g1 = m.get(&CaptureKey::ByIndex(1)).cloned().unwrap_or_default();
                 let g2 = m.get(&CaptureKey::ByIndex(2)).cloned().unwrap_or_default();
                 if g2 == "[" {
@@ -514,8 +512,7 @@ impl GitHubDriver {
                     continue;
                 }
                 let mut m2: IndexMap<CaptureKey, String> = IndexMap::new();
-                if Preg::is_match_strict_groups3(r"{^\[(.*?)\](?:\s*#.*)?$}", &g2, Some(&mut m2))
-                    .unwrap_or(false)
+                if Preg::is_match3(r"{^\[(.*?)\](?:\s*#.*)?$}", &g2, Some(&mut m2)).unwrap_or(false)
                 {
                     let inner = m2.get(&CaptureKey::ByIndex(1)).cloned().unwrap_or_default();
                     for item in array_map(
@@ -530,12 +527,8 @@ impl GitHubDriver {
                         );
                         result.push(entry);
                     }
-                } else if Preg::is_match_strict_groups3(
-                    r"{^([^#].*?)(?:\s+#.*)?$}",
-                    &g2,
-                    Some(&mut m2),
-                )
-                .unwrap_or(false)
+                } else if Preg::is_match3(r"{^([^#].*?)(?:\s+#.*)?$}", &g2, Some(&mut m2))
+                    .unwrap_or(false)
                 {
                     let mut entry = IndexMap::new();
                     entry.insert("type".to_string(), PhpMixed::String(g1.clone()));
@@ -549,15 +542,13 @@ impl GitHubDriver {
                     result.push(entry);
                 }
                 key = None;
-            } else if Preg::is_match_strict_groups3(r"{^(\w+)\s*:\s*#\s*$}", &line, Some(&mut m))
-                .unwrap_or(false)
+            } else if Preg::is_match3(r"{^(\w+)\s*:\s*#\s*$}", &line, Some(&mut m)).unwrap_or(false)
             {
                 key = Some(m.get(&CaptureKey::ByIndex(1)).cloned().unwrap_or_default());
             } else if key.is_some() && {
                 let mut tmp: IndexMap<CaptureKey, String> = IndexMap::new();
-                Preg::is_match_strict_groups3(r"{^-\s*(.+)(?:\s+#.*)?$}", &line, Some(&mut m))
-                    .unwrap_or(false)
-                    || Preg::is_match_strict_groups3(r"{^(.+),(?:\s*#.*)?$}", &line, Some(&mut tmp))
+                Preg::is_match3(r"{^-\s*(.+)(?:\s+#.*)?$}", &line, Some(&mut m)).unwrap_or(false)
+                    || Preg::is_match3(r"{^(.+),(?:\s*#.*)?$}", &line, Some(&mut tmp))
                         .unwrap_or(false)
                         && {
                             m = tmp;
@@ -961,7 +952,7 @@ impl GitHubDriver {
         _deep: bool,
     ) -> anyhow::Result<bool> {
         let mut matches: IndexMap<CaptureKey, String> = IndexMap::new();
-        if !Preg::is_match_strict_groups3(
+        if !Preg::is_match3(
             r"#^((?:https?|git)://([^/]+)/|git@([^:]+):/?)([^/]+)/([^/]+?)(?:\.git|/)?$#",
             url,
             Some(&mut matches),
@@ -1329,9 +1320,7 @@ impl GitHubDriver {
         let links = explode(",", &header);
         for link in &links {
             let mut m: IndexMap<CaptureKey, String> = IndexMap::new();
-            if Preg::is_match_strict_groups3(r#"{<(.+?)>; *rel="next"}"#, link, Some(&mut m))
-                .unwrap_or(false)
-            {
+            if Preg::is_match3(r#"{<(.+?)>; *rel="next"}"#, link, Some(&mut m)).unwrap_or(false) {
                 return Some(m.get(&CaptureKey::ByIndex(1)).cloned().unwrap_or_default());
             }
         }
diff --git a/crates/shirabe/src/repository/vcs/gitlab_driver.rs b/crates/shirabe/src/repository/vcs/gitlab_driver.rs
index bc47db8..a123a24 100644
--- a/crates/shirabe/src/repository/vcs/gitlab_driver.rs
+++ b/crates/shirabe/src/repository/vcs/gitlab_driver.rs
@@ -84,9 +84,7 @@ impl GitLabDriver {
     /// SSH urls use https by default. Set "secure-http": false on the repository config to use http instead.
     pub fn initialize(&mut self) -> Result<()> {
         let mut match_: IndexMap<CaptureKey, String> = IndexMap::new();
-        if !Preg::is_match_strict_groups3(Self::URL_REGEX, &self.inner.url, Some(&mut match_))
-            .unwrap_or(false)
-        {
+        if !Preg::is_match3(Self::URL_REGEX, &self.inner.url, Some(&mut match_)).unwrap_or(false) {
             return Err(InvalidArgumentException {
                 message: format!(
                     "The GitLab repository URL {} is invalid. It must be the HTTP URL of a GitLab project.",
@@ -989,8 +987,7 @@ impl GitLabDriver {
         _deep: bool,
     ) -> anyhow::Result<bool> {
         let mut match_: IndexMap<CaptureKey, String> = IndexMap::new();
-        if !Preg::is_match_strict_groups3(Self::URL_REGEX, url, Some(&mut match_)).unwrap_or(false)
-        {
+        if !Preg::is_match3(Self::URL_REGEX, url, Some(&mut match_)).unwrap_or(false) {
             return Ok(false);
         }
 
@@ -1058,7 +1055,7 @@ impl GitLabDriver {
         let links = explode(",", &header);
         for link in &links {
             let mut match_: IndexMap<CaptureKey, String> = IndexMap::new();
-            if Preg::is_match_strict_groups3(r#"{<(.+?)>; *rel="next"}"#, link, Some(&mut match_))
+            if Preg::is_match3(r#"{<(.+?)>; *rel="next"}"#, link, Some(&mut match_))
                 .unwrap_or(false)
             {
                 return Some(
diff --git a/crates/shirabe/src/repository/vcs/hg_driver.rs b/crates/shirabe/src/repository/vcs/hg_driver.rs
index f637437..c76f496 100644
--- a/crates/shirabe/src/repository/vcs/hg_driver.rs
+++ b/crates/shirabe/src/repository/vcs/hg_driver.rs
@@ -244,9 +244,7 @@ impl HgDriver {
             for tag in self.inner.process.borrow().split_lines(&output) {
                 if !tag.is_empty() {
                     let mut m: IndexMap<CaptureKey, String> = IndexMap::new();
-                    if Preg::match_strict_groups3(r"^([^\s]+)\s+\d+:(.*)$", &tag, Some(&mut m))
-                        .unwrap_or(false)
-                    {
+                    if Preg::match3(r"^([^\s]+)\s+\d+:(.*)$", &tag, Some(&mut m)).unwrap_or(false) {
                         tags.insert(
                             m.get(&CaptureKey::ByIndex(1)).cloned().unwrap_or_default(),
                             m.get(&CaptureKey::ByIndex(2)).cloned().unwrap_or_default(),
@@ -276,12 +274,8 @@ impl HgDriver {
             for branch in self.inner.process.borrow().split_lines(&output) {
                 if !branch.is_empty() {
                     let mut m: IndexMap<CaptureKey, String> = IndexMap::new();
-                    if Preg::match_strict_groups3(
-                        r"^([^\s]+)\s+\d+:([a-f0-9]+)",
-                        &branch,
-                        Some(&mut m),
-                    )
-                    .unwrap_or(false)
+                    if Preg::match3(r"^([^\s]+)\s+\d+:([a-f0-9]+)", &branch, Some(&mut m))
+                        .unwrap_or(false)
                     {
                         let name = m.get(&CaptureKey::ByIndex(1)).cloned().unwrap_or_default();
                         if !name.starts_with('-') {
@@ -303,12 +297,8 @@ impl HgDriver {
             for branch in self.inner.process.borrow().split_lines(&output) {
                 if !branch.is_empty() {
                     let mut m: IndexMap<CaptureKey, String> = IndexMap::new();
-                    if Preg::match_strict_groups3(
-                        r"^(?:[\s*]*)([^\s]+)\s+\d+:(.*)$",
-                        &branch,
-                        Some(&mut m),
-                    )
-                    .unwrap_or(false)
+                    if Preg::match3(r"^(?:[\s*]*)([^\s]+)\s+\d+:(.*)$", &branch, Some(&mut m))
+                        .unwrap_or(false)
                     {
                         let name = m.get(&CaptureKey::ByIndex(1)).cloned().unwrap_or_default();
                         if !name.starts_with('-') {
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<CaptureKey, String> = 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::<Utc>(date_str.trim())
@@ -358,12 +354,8 @@ impl SvnDriver {
                         let line = trim(&line, None);
                         if !line.is_empty() {
                             let mut m: IndexMap<CaptureKey, String> = 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<CaptureKey, String> = 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<CaptureKey, String> = 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))