aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/dependency_resolver
diff options
context:
space:
mode:
Diffstat (limited to 'crates/shirabe/src/dependency_resolver')
-rw-r--r--crates/shirabe/src/dependency_resolver/lock_transaction.rs16
-rw-r--r--crates/shirabe/src/dependency_resolver/pool_builder.rs2
-rw-r--r--crates/shirabe/src/dependency_resolver/problem.rs2
3 files changed, 7 insertions, 13 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))
},
diff --git a/crates/shirabe/src/dependency_resolver/pool_builder.rs b/crates/shirabe/src/dependency_resolver/pool_builder.rs
index f5143897..27ae409b 100644
--- a/crates/shirabe/src/dependency_resolver/pool_builder.rs
+++ b/crates/shirabe/src/dependency_resolver/pool_builder.rs
@@ -19,7 +19,7 @@ use crate::repository::RepositoryInterface;
use crate::repository::RepositoryInterfaceHandle;
use crate::repository::RootPackageRepository;
use indexmap::IndexMap;
-use shirabe_external_packages::composer::pcre::Preg;
+use shirabe_pcre::Preg;
use shirabe_php_shim::{
CmpOp, LogicException, PhpMixed, array_flip_strings, array_map, in_array_strict, microtime,
number_format, round, strpos,
diff --git a/crates/shirabe/src/dependency_resolver/problem.rs b/crates/shirabe/src/dependency_resolver/problem.rs
index 63cbc6fb..99fc02b9 100644
--- a/crates/shirabe/src/dependency_resolver/problem.rs
+++ b/crates/shirabe/src/dependency_resolver/problem.rs
@@ -10,8 +10,8 @@ use crate::repository::LockArrayRepository;
use crate::repository::PlatformRepository;
use crate::repository::RepositorySet;
use indexmap::IndexMap;
-use shirabe_external_packages::composer::pcre::{CaptureKey, Preg};
use shirabe_external_packages::symfony::console::formatter::OutputFormatter;
+use shirabe_pcre::{CaptureKey, Preg};
use shirabe_php_shim::{
CmpOp, LogicException, PhpMixed, defined, extension_loaded, implode, loosely_compare,
php_regex, spl_object_hash, sprintf, str_replace, str_starts_with, stripos, strpos, strtolower,