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/pool.rs4
-rw-r--r--crates/shirabe/src/dependency_resolver/rule.rs4
2 files changed, 4 insertions, 4 deletions
diff --git a/crates/shirabe/src/dependency_resolver/pool.rs b/crates/shirabe/src/dependency_resolver/pool.rs
index 7b60002..b25f348 100644
--- a/crates/shirabe/src/dependency_resolver/pool.rs
+++ b/crates/shirabe/src/dependency_resolver/pool.rs
@@ -3,7 +3,7 @@
use std::fmt;
use indexmap::IndexMap;
-use shirabe_php_shim::{STR_PAD_LEFT, abs, str_pad};
+use shirabe_php_shim::{STR_PAD_LEFT, str_pad};
use shirabe_semver::compiling_matcher::CompilingMatcher;
use shirabe_semver::constraint::AnyConstraint;
use shirabe_semver::constraint::SimpleConstraint;
@@ -280,7 +280,7 @@ impl Pool {
}
pub fn literal_to_package(&self, literal: i64) -> BasePackageHandle {
- let package_id = abs(literal);
+ let package_id = literal.abs();
self.package_by_id(package_id)
}
diff --git a/crates/shirabe/src/dependency_resolver/rule.rs b/crates/shirabe/src/dependency_resolver/rule.rs
index 30fa079..7686a3e 100644
--- a/crates/shirabe/src/dependency_resolver/rule.rs
+++ b/crates/shirabe/src/dependency_resolver/rule.rs
@@ -7,7 +7,7 @@ use std::rc::Rc;
use anyhow::Result;
use indexmap::IndexMap;
use shirabe_php_shim::{
- LogicException, PhpMixed, RuntimeException, abs, array_filter, array_keys, array_shift,
+ LogicException, PhpMixed, RuntimeException, array_filter, array_keys, array_shift,
array_values, implode, is_object,
};
use shirabe_semver::constraint::AnyConstraint;
@@ -554,7 +554,7 @@ impl Rule {
let mut installed_packages: Vec<BasePackageHandle> = vec![];
let mut removable_packages: Vec<BasePackageHandle> = vec![];
for literal in &literals {
- if installed_map.contains_key(&abs(*literal).to_string()) {
+ if installed_map.contains_key(&literal.abs().to_string()) {
installed_packages.push(pool.literal_to_package(*literal));
} else {
removable_packages.push(pool.literal_to_package(*literal));