diff options
Diffstat (limited to 'crates/shirabe/src/package/archiver/archive_manager.rs')
| -rw-r--r-- | crates/shirabe/src/package/archiver/archive_manager.rs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/crates/shirabe/src/package/archiver/archive_manager.rs b/crates/shirabe/src/package/archiver/archive_manager.rs index a0216d88..4f9e2ddc 100644 --- a/crates/shirabe/src/package/archiver/archive_manager.rs +++ b/crates/shirabe/src/package/archiver/archive_manager.rs @@ -10,10 +10,9 @@ use crate::util::Filesystem; use crate::util::SyncHelper; use crate::util::r#loop::Loop; use indexmap::IndexMap; -use shirabe_pcre::Preg; use shirabe_php_shim::{ - InvalidArgumentException, RuntimeException, bin2hex, file_exists, php_regex, random_bytes, - realpath, sys_get_temp_dir, + InvalidArgumentException, RuntimeException, bin2hex, file_exists, php_regex, preg_match2, + preg_replace, random_bytes, realpath, sys_get_temp_dir, }; pub struct ArchiveManager { @@ -58,7 +57,7 @@ impl ArchiveManager { ) -> anyhow::Result<IndexMap<String, String>> { let base_name = match package.get_archive_name() { Some(name) => name, - None => Preg::replace(php_regex!("#[^a-z0-9-_]#i"), "-", &package.get_name()), + None => preg_replace(php_regex!("#[^a-z0-9-_]#i"), "-", &package.get_name()), }; let mut parts: IndexMap<String, String> = IndexMap::new(); @@ -66,7 +65,7 @@ impl ArchiveManager { let dist_reference = package.get_dist_reference(); if let Some(ref dist_ref) = dist_reference { - if Preg::is_match(php_regex!("{^[a-f0-9]{40}$}"), dist_ref) { + if preg_match2(php_regex!("{^[a-f0-9]{40}$}"), dist_ref, 0).is_some() { parts.insert("dist_reference".to_string(), dist_ref.to_string()); if let Some(dist_type) = package.get_dist_type() { parts.insert("dist_type".to_string(), dist_type); |