diff options
Diffstat (limited to 'crates/shirabe/src/dependency_resolver')
| -rw-r--r-- | crates/shirabe/src/dependency_resolver/generic_rule.rs | 3 | ||||
| -rw-r--r-- | crates/shirabe/src/dependency_resolver/multi_conflict_rule.rs | 9 | ||||
| -rw-r--r-- | crates/shirabe/src/dependency_resolver/rule.rs | 7 |
3 files changed, 10 insertions, 9 deletions
diff --git a/crates/shirabe/src/dependency_resolver/generic_rule.rs b/crates/shirabe/src/dependency_resolver/generic_rule.rs index afab376..328a770 100644 --- a/crates/shirabe/src/dependency_resolver/generic_rule.rs +++ b/crates/shirabe/src/dependency_resolver/generic_rule.rs @@ -2,7 +2,6 @@ use super::rule::ReasonData; use crate::dependency_resolver::{Rule, RuleBase}; -use anyhow::Result; use shirabe_php_shim::{PHP_VERSION_ID, RuntimeException, hash_raw, unpack}; #[derive(Debug)] @@ -30,7 +29,7 @@ impl GenericRule { &self.literals } - pub fn get_hash(&self) -> Result<i64> { + pub fn get_hash(&self) -> anyhow::Result<i64> { let joined = self .literals .iter() diff --git a/crates/shirabe/src/dependency_resolver/multi_conflict_rule.rs b/crates/shirabe/src/dependency_resolver/multi_conflict_rule.rs index 8db0f7f..bfbfc82 100644 --- a/crates/shirabe/src/dependency_resolver/multi_conflict_rule.rs +++ b/crates/shirabe/src/dependency_resolver/multi_conflict_rule.rs @@ -1,7 +1,6 @@ //! ref: composer/src/Composer/DependencyResolver/MultiConflictRule.php use crate::dependency_resolver::{ReasonData, Rule, RuleBase}; -use anyhow::Result; use shirabe_php_shim::{PHP_VERSION_ID, RuntimeException, hash_raw}; #[derive(Debug)] @@ -11,7 +10,11 @@ pub struct MultiConflictRule { } impl MultiConflictRule { - pub fn new(mut literals: Vec<i64>, reason: i64, reason_data: ReasonData) -> Result<Self> { + pub fn new( + mut literals: Vec<i64>, + reason: i64, + reason_data: ReasonData, + ) -> anyhow::Result<Self> { if literals.len() < 3 { return Err(RuntimeException { message: "multi conflict rule requires at least 3 literals".to_string(), @@ -41,7 +44,7 @@ impl MultiConflictRule { &self.literals } - pub fn get_hash(&self) -> Result<i64> { + pub fn get_hash(&self) -> anyhow::Result<i64> { let joined = self .literals .iter() diff --git a/crates/shirabe/src/dependency_resolver/rule.rs b/crates/shirabe/src/dependency_resolver/rule.rs index 958af5a..ab4eeb0 100644 --- a/crates/shirabe/src/dependency_resolver/rule.rs +++ b/crates/shirabe/src/dependency_resolver/rule.rs @@ -12,7 +12,6 @@ use crate::package::version::VersionParser; use crate::repository::PlatformRepository; use crate::repository::RepositoryInterface; use crate::repository::RepositorySet; -use anyhow::Result; use indexmap::IndexMap; use shirabe_php_shim::{ LogicException, PhpMixed, RuntimeException, array_keys, array_shift, implode, @@ -97,7 +96,7 @@ impl Rule { } } - pub fn get_hash(&self) -> Result<PhpMixed> { + pub fn get_hash(&self) -> anyhow::Result<PhpMixed> { match self { Rule::Generic(r) => Ok(PhpMixed::Int(r.get_hash()?)), Rule::MultiConflict(r) => Ok(PhpMixed::Int(r.get_hash()?)), @@ -170,7 +169,7 @@ impl Rule { (self.bitfield() & (255 << BITFIELD_TYPE)) >> BITFIELD_TYPE } - pub fn disable(&mut self) -> Result<()> { + pub fn disable(&mut self) -> anyhow::Result<()> { if let Rule::MultiConflict(_) = self { return Err(RuntimeException { message: "Disabling multi conflict rules is not possible. Please contact composer at https://github.com/composer/composer to let us debug what lead to this situation.".to_string(), @@ -278,7 +277,7 @@ impl Rule { } /// @internal - pub fn get_source_package(&self, pool: &Pool) -> Result<BasePackageHandle> { + pub fn get_source_package(&self, pool: &Pool) -> anyhow::Result<BasePackageHandle> { let literals = self.get_literals(); match self.get_reason() { |
