aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/dependency_resolver/lock_transaction.rs
diff options
context:
space:
mode:
Diffstat (limited to 'crates/shirabe/src/dependency_resolver/lock_transaction.rs')
-rw-r--r--crates/shirabe/src/dependency_resolver/lock_transaction.rs16
1 files changed, 5 insertions, 11 deletions
diff --git a/crates/shirabe/src/dependency_resolver/lock_transaction.rs b/crates/shirabe/src/dependency_resolver/lock_transaction.rs
index a8253215..e230801f 100644
--- a/crates/shirabe/src/dependency_resolver/lock_transaction.rs
+++ b/crates/shirabe/src/dependency_resolver/lock_transaction.rs
@@ -5,7 +5,7 @@ use crate::dependency_resolver::Pool;
use crate::dependency_resolver::Transaction;
use crate::package::PackageInterfaceHandle;
use indexmap::IndexMap;
-use shirabe_external_packages::composer::pcre::Preg;
+use shirabe_pcre::Preg;
use shirabe_php_shim::php_regex;
#[derive(Debug)]
@@ -176,17 +176,11 @@ impl LockTransaction {
let dist_reference = present_package.get_dist_reference().unwrap();
let new_dist_url = Preg::replace_callback(
php_regex!(r"{(/|sha=)[a-f0-9]{40}(/|$)}i"),
- |m: &indexmap::IndexMap<
- shirabe_external_packages::composer::pcre::CaptureKey,
- String,
- >|
- -> String {
+ |m: &indexmap::IndexMap<shirabe_pcre::CaptureKey, String>| -> String {
let get = |i: usize| -> String {
- m.get(
- &shirabe_external_packages::composer::pcre::CaptureKey::ByIndex(i),
- )
- .cloned()
- .unwrap_or_default()
+ m.get(&shirabe_pcre::CaptureKey::ByIndex(i))
+ .cloned()
+ .unwrap_or_default()
};
format!("{}{}{}", get(1), dist_reference, get(2))
},