diff options
Diffstat (limited to 'crates/shirabe/src/platform/version.rs')
| -rw-r--r-- | crates/shirabe/src/platform/version.rs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/crates/shirabe/src/platform/version.rs b/crates/shirabe/src/platform/version.rs index cbbbe44e..feed1b85 100644 --- a/crates/shirabe/src/platform/version.rs +++ b/crates/shirabe/src/platform/version.rs @@ -2,7 +2,7 @@ use indexmap::IndexMap; use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; -use shirabe_php_shim::version_compare; +use shirabe_php_shim::{php_regex, version_compare}; pub struct Version; @@ -12,7 +12,9 @@ impl Version { let mut matches: IndexMap<CaptureKey, String> = IndexMap::new(); if !Preg::match3( - r"/^(?P<version>[0-9.]+)(?P<patch>[a-z]{0,2})(?P<suffix>(?:-?(?:dev|pre|alpha|beta|rc|fips)[\d]*)*)(?:-\w+)?(?: \(.+?\))?$/", + 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), ) { @@ -56,7 +58,7 @@ impl Version { pub fn parse_libjpeg(libjpeg_version: &str) -> Option<String> { let mut matches: IndexMap<CaptureKey, String> = IndexMap::new(); if !Preg::match3( - r"/^(?P<major>\d+)(?P<minor>[a-z]*)$/", + php_regex!(r"/^(?P<major>\d+)(?P<minor>[a-z]*)$/"), libjpeg_version, Some(&mut matches), ) { @@ -81,7 +83,7 @@ impl Version { pub fn parse_zoneinfo_version(zoneinfo_version: &str) -> Option<String> { let mut matches: IndexMap<CaptureKey, String> = IndexMap::new(); if !Preg::match3( - r"/^(?P<year>\d{4})(?P<revision>[a-z]*)$/", + php_regex!(r"/^(?P<year>\d{4})(?P<revision>[a-z]*)$/"), zoneinfo_version, Some(&mut matches), ) { |