diff options
Diffstat (limited to 'crates/shirabe/src/dependency_resolver')
10 files changed, 10 insertions, 36 deletions
diff --git a/crates/shirabe/src/dependency_resolver/default_policy.rs b/crates/shirabe/src/dependency_resolver/default_policy.rs index 863637c..5b0981d 100644 --- a/crates/shirabe/src/dependency_resolver/default_policy.rs +++ b/crates/shirabe/src/dependency_resolver/default_policy.rs @@ -4,7 +4,6 @@ use std::cell::RefCell; use indexmap::IndexMap; use shirabe_semver::CompilingMatcher; -use shirabe_semver::constraint::AnyConstraint; use shirabe_semver::constraint::SimpleConstraint; use crate::dependency_resolver::PolicyInterface; diff --git a/crates/shirabe/src/dependency_resolver/pool.rs b/crates/shirabe/src/dependency_resolver/pool.rs index 652cf43..43d959b 100644 --- a/crates/shirabe/src/dependency_resolver/pool.rs +++ b/crates/shirabe/src/dependency_resolver/pool.rs @@ -9,7 +9,6 @@ use shirabe_semver::constraint::AnyConstraint; use shirabe_semver::constraint::SimpleConstraint; use crate::advisory::AnySecurityAdvisory; -use crate::package::BasePackage; use crate::package::BasePackageHandle; use crate::package::version::VersionParser; diff --git a/crates/shirabe/src/dependency_resolver/pool_builder.rs b/crates/shirabe/src/dependency_resolver/pool_builder.rs index 3663e43..e2c5b11 100644 --- a/crates/shirabe/src/dependency_resolver/pool_builder.rs +++ b/crates/shirabe/src/dependency_resolver/pool_builder.rs @@ -5,8 +5,8 @@ use indexmap::IndexMap; use shirabe_external_packages::composer::pcre::Preg; use shirabe_php_shim::{ - LogicException, PhpMixed, array_flip, array_flip_strings, array_map, array_merge, array_search, - array_search_mixed, count, in_array, microtime, number_format, round, sprintf, strpos, + LogicException, PhpMixed, array_flip_strings, array_map, in_array, microtime, number_format, + round, strpos, }; use shirabe_semver::CompilingMatcher; use shirabe_semver::Intervals; @@ -25,16 +25,11 @@ use crate::io::IOInterfaceImmutable; use crate::package::AliasPackageHandle; use crate::package::BasePackageHandle; use crate::package::CompleteAliasPackageHandle; -use crate::package::CompletePackage; -use crate::package::PackageInterface; use crate::package::PackageInterfaceHandle; use crate::package::base_package; use crate::package::version::StabilityFilter; -use crate::plugin::PluginEvents; -use crate::plugin::PrePoolCreateEvent; use crate::repository::CanonicalPackagesTrait; use crate::repository::PlatformRepository; -use crate::repository::RepositoryInterface; use crate::repository::RepositoryInterfaceHandle; use crate::repository::RootPackageRepository; diff --git a/crates/shirabe/src/dependency_resolver/pool_optimizer.rs b/crates/shirabe/src/dependency_resolver/pool_optimizer.rs index 46bed91..3cc5551 100644 --- a/crates/shirabe/src/dependency_resolver/pool_optimizer.rs +++ b/crates/shirabe/src/dependency_resolver/pool_optimizer.rs @@ -3,7 +3,7 @@ use std::rc::Rc; use indexmap::IndexMap; -use shirabe_php_shim::{PhpMixed, implode, ksort}; +use shirabe_php_shim::{implode, ksort}; use shirabe_semver::CompilingMatcher; use shirabe_semver::Intervals; use shirabe_semver::constraint::AnyConstraint; @@ -14,7 +14,6 @@ use crate::dependency_resolver::PolicyInterface; use crate::dependency_resolver::Pool; use crate::dependency_resolver::Request; use crate::package::BasePackageHandle; -use crate::package::PackageInterface; use crate::package::version::VersionParser; /// Optimizes a given pool diff --git a/crates/shirabe/src/dependency_resolver/problem.rs b/crates/shirabe/src/dependency_resolver/problem.rs index b65a2c9..230ebc3 100644 --- a/crates/shirabe/src/dependency_resolver/problem.rs +++ b/crates/shirabe/src/dependency_resolver/problem.rs @@ -5,25 +5,19 @@ use indexmap::IndexMap; use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; use shirabe_external_packages::symfony::console::formatter::OutputFormatter; use shirabe_php_shim::{ - LogicException, PhpMixed, defined, extension_loaded, implode, in_array, php_to_string, - phpversion, spl_object_hash, sprintf, str_replace, str_starts_with, stripos, strpos, - strtolower, substr, substr_count, version_compare, + LogicException, PhpMixed, defined, extension_loaded, implode, in_array, phpversion, + spl_object_hash, sprintf, str_replace, str_starts_with, stripos, strpos, strtolower, substr, + substr_count, version_compare, }; use shirabe_semver::constraint::AnyConstraint; use shirabe_semver::constraint::MultiConstraint; use shirabe_semver::constraint::SimpleConstraint; -use crate::advisory::SecurityAdvisory; use crate::dependency_resolver::Pool; use crate::dependency_resolver::Request; use crate::dependency_resolver::rule::{self, Rule}; -use crate::package::AliasPackage; -use crate::package::BasePackage; use crate::package::BasePackageHandle; -use crate::package::CompletePackageInterface; use crate::package::Link; -use crate::package::PackageInterface; -use crate::package::RootPackageInterface; use crate::package::version::VersionParser; use crate::repository::LockArrayRepository; use crate::repository::PlatformRepository; diff --git a/crates/shirabe/src/dependency_resolver/request.rs b/crates/shirabe/src/dependency_resolver/request.rs index d391c0a..d3bcdfc 100644 --- a/crates/shirabe/src/dependency_resolver/request.rs +++ b/crates/shirabe/src/dependency_resolver/request.rs @@ -1,7 +1,7 @@ //! ref: composer/src/Composer/DependencyResolver/Request.php use indexmap::IndexMap; -use shirabe_php_shim::{LogicException, spl_object_hash, strtolower}; +use shirabe_php_shim::{LogicException, strtolower}; use shirabe_semver::constraint::AnyConstraint; use shirabe_semver::constraint::MatchAllConstraint; diff --git a/crates/shirabe/src/dependency_resolver/rule.rs b/crates/shirabe/src/dependency_resolver/rule.rs index bc6fd95..306f633 100644 --- a/crates/shirabe/src/dependency_resolver/rule.rs +++ b/crates/shirabe/src/dependency_resolver/rule.rs @@ -1,14 +1,12 @@ //! ref: composer/src/Composer/DependencyResolver/Rule.php -use std::any::Any; use std::cell::RefCell; use std::rc::Rc; use anyhow::Result; use indexmap::IndexMap; use shirabe_php_shim::{ - LogicException, PhpMixed, RuntimeException, array_filter, array_keys, array_shift, - array_values, implode, is_object, + LogicException, PhpMixed, RuntimeException, array_keys, array_shift, implode, }; use shirabe_semver::constraint::AnyConstraint; use shirabe_semver::constraint::SimpleConstraint; @@ -19,12 +17,8 @@ use crate::dependency_resolver::Pool; use crate::dependency_resolver::Problem; use crate::dependency_resolver::Request; use crate::dependency_resolver::Rule2Literals; -use crate::dependency_resolver::RuleSet; -use crate::package::AliasPackage; -use crate::package::BasePackage; use crate::package::BasePackageHandle; use crate::package::Link; -use crate::package::PackageInterface; use crate::package::version::VersionParser; use crate::repository::PlatformRepository; use crate::repository::RepositoryInterface; @@ -598,7 +592,7 @@ impl Rule { ) } r if r == RULE_LEARNED => { - /// @TODO currently still generates way too much output to be helpful, and in some cases can even lead to endless recursion + // @TODO currently still generates way too much output to be helpful, and in some cases can even lead to endless recursion // (PHP commented-out alternative code preserved) let learned_string = " (conflict analysis result)"; diff --git a/crates/shirabe/src/dependency_resolver/rule_set.rs b/crates/shirabe/src/dependency_resolver/rule_set.rs index 2d1cb78..d88f346 100644 --- a/crates/shirabe/src/dependency_resolver/rule_set.rs +++ b/crates/shirabe/src/dependency_resolver/rule_set.rs @@ -10,7 +10,6 @@ use crate::dependency_resolver::Pool; use crate::dependency_resolver::Request; use crate::dependency_resolver::Rule; use crate::dependency_resolver::RuleSetIterator; -use crate::package::BasePackageHandle; use crate::repository::RepositorySet; #[derive(Debug)] diff --git a/crates/shirabe/src/dependency_resolver/rule_set_generator.rs b/crates/shirabe/src/dependency_resolver/rule_set_generator.rs index 5ec027b..1d9d0c4 100644 --- a/crates/shirabe/src/dependency_resolver/rule_set_generator.rs +++ b/crates/shirabe/src/dependency_resolver/rule_set_generator.rs @@ -1,12 +1,10 @@ //! ref: composer/src/Composer/DependencyResolver/RuleSetGenerator.php -use std::any::Any; use std::cell::RefCell; use std::collections::VecDeque; use std::rc::Rc; use indexmap::IndexMap; -use shirabe_php_shim::PhpMixed; use crate::dependency_resolver::GenericRule; use crate::dependency_resolver::MultiConflictRule; diff --git a/crates/shirabe/src/dependency_resolver/solver.rs b/crates/shirabe/src/dependency_resolver/solver.rs index cd00757..53a26ac 100644 --- a/crates/shirabe/src/dependency_resolver/solver.rs +++ b/crates/shirabe/src/dependency_resolver/solver.rs @@ -5,15 +5,12 @@ use std::rc::Rc; use indexmap::IndexMap; -use shirabe_php_shim::{ - PhpMixed, array_pop, array_shift, array_unshift, microtime, spl_object_hash, sprintf, -}; +use shirabe_php_shim::{array_shift, array_unshift, microtime, spl_object_hash}; use shirabe_semver::constraint::AnyConstraint; use crate::dependency_resolver::Decisions; use crate::dependency_resolver::GenericRule; use crate::dependency_resolver::LockTransaction; -use crate::dependency_resolver::MultiConflictRule; use crate::dependency_resolver::PolicyInterface; use crate::dependency_resolver::Pool; use crate::dependency_resolver::Problem; |