1 files changed, 7 insertions, 19 deletions

diff --git a/crates/shirabe/src/platform/version.rs b/crates/shirabe/src/platform/version.rs
index 2bcb4c38..b89d052b 100644
--- a/crates/shirabe/src/platform/version.rs
+++ b/crates/shirabe/src/platform/version.rs
@@ -1,6 +1,6 @@
 //! ref: composer/src/Composer/Platform/Version.php
 
-use shirabe_pcre::{CaptureKey, Preg, PregMatchedGroups};
+use shirabe_pcre::{CaptureKey, Preg};
 use shirabe_php_shim::{CmpOp, php_regex, version_compare};
 
 pub struct Version;
@@ -9,16 +9,12 @@ impl Version {
     pub fn parse_openssl(openssl_version: &str, is_fips: &mut bool) -> Option<String> {
         *is_fips = false;
 
-        let mut matches = PregMatchedGroups::new();
-        if !Preg::match3(
+        let matches = Preg::match3(
             php_regex!(
                 r"/^(?P<version>[0-9.]+)(?P<patch>[a-z]{0,2})(?P<suffix>(?:-?(?:dev|pre|alpha|beta|rc|fips)[\d]*)*)(?:-\w+)?(?: \(.+?\))?$/"
             ),
             openssl_version,
-            Some(&mut matches),
-        ) {
-            return None;
-        }
+        )?;
 
         let version = matches
             .get(&CaptureKey::ByName("version".to_string()))
@@ -55,14 +51,10 @@ impl Version {
     }
 
     pub fn parse_libjpeg(libjpeg_version: &str) -> Option<String> {
-        let mut matches = PregMatchedGroups::new();
-        if !Preg::match3(
+        let matches = Preg::match3(
             php_regex!(r"/^(?P<major>\d+)(?P<minor>[a-z]*)$/"),
             libjpeg_version,
-            Some(&mut matches),
-        ) {
-            return None;
-        }
+        )?;
 
         let major = matches
             .get(&CaptureKey::ByName("major".to_string()))
@@ -80,14 +72,10 @@ impl Version {
     }
 
     pub fn parse_zoneinfo_version(zoneinfo_version: &str) -> Option<String> {
-        let mut matches = PregMatchedGroups::new();
-        if !Preg::match3(
+        let matches = Preg::match3(
             php_regex!(r"/^(?P<year>\d{4})(?P<revision>[a-z]*)$/"),
             zoneinfo_version,
-            Some(&mut matches),
-        ) {
-            return None;
-        }
+        )?;
 
         let year = matches
             .get(&CaptureKey::ByName("year".to_string()))