diff options
Diffstat (limited to 'crates/shirabe/src/platform')
| -rw-r--r-- | crates/shirabe/src/platform/version.rs | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/crates/shirabe/src/platform/version.rs b/crates/shirabe/src/platform/version.rs index e602f15..f1d2b87 100644 --- a/crates/shirabe/src/platform/version.rs +++ b/crates/shirabe/src/platform/version.rs @@ -11,11 +11,9 @@ impl Version { *is_fips = false; let mut matches: IndexMap<CaptureKey, String> = IndexMap::new(); - if !Preg::match_strict_groups3( - 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), - ) + if !Preg::match3(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),) .unwrap_or(false) { return None; @@ -57,7 +55,7 @@ impl Version { pub fn parse_libjpeg(libjpeg_version: &str) -> Option<String> { let mut matches: IndexMap<CaptureKey, String> = IndexMap::new(); - if !Preg::match_strict_groups3( + if !Preg::match3( r"^(?P<major>\d+)(?P<minor>[a-z]*)$", libjpeg_version, Some(&mut matches), @@ -84,7 +82,7 @@ impl Version { pub fn parse_zoneinfo_version(zoneinfo_version: &str) -> Option<String> { let mut matches: IndexMap<CaptureKey, String> = IndexMap::new(); - if !Preg::match_strict_groups3( + if !Preg::match3( r"^(?P<year>\d{4})(?P<revision>[a-z]*)$", zoneinfo_version, Some(&mut matches), |