diff options
Diffstat (limited to 'crates/shirabe/src/package/version')
6 files changed, 48 insertions, 41 deletions
diff --git a/crates/shirabe/src/package/version/mod.rs b/crates/shirabe/src/package/version/mod.rs index a734e23..b2f32a2 100644 --- a/crates/shirabe/src/package/version/mod.rs +++ b/crates/shirabe/src/package/version/mod.rs @@ -3,3 +3,9 @@ pub mod version_bumper; pub mod version_guesser; pub mod version_parser; pub mod version_selector; + +pub use stability_filter::*; +pub use version_bumper::*; +pub use version_guesser::*; +pub use version_parser::*; +pub use version_selector::*; diff --git a/crates/shirabe/src/package/version/stability_filter.rs b/crates/shirabe/src/package/version/stability_filter.rs index 5053e9d..da2f1a6 100644 --- a/crates/shirabe/src/package/version/stability_filter.rs +++ b/crates/shirabe/src/package/version/stability_filter.rs @@ -1,6 +1,6 @@ //! ref: composer/src/Composer/Package/Version/StabilityFilter.php -use crate::package::base_package::STABILITIES; +use crate::package::STABILITIES; use indexmap::IndexMap; pub struct StabilityFilter; diff --git a/crates/shirabe/src/package/version/version_bumper.rs b/crates/shirabe/src/package/version/version_bumper.rs index f7c2377..a9b5a67 100644 --- a/crates/shirabe/src/package/version/version_bumper.rs +++ b/crates/shirabe/src/package/version/version_bumper.rs @@ -1,14 +1,14 @@ //! ref: composer/src/Composer/Package/Version/VersionBumper.php -use crate::package::dumper::array_dumper::ArrayDumper; -use crate::package::loader::array_loader::ArrayLoader; -use crate::package::package_interface::PackageInterface; -use crate::package::version::version_parser::VersionParser; -use crate::util::platform::Platform; +use crate::package::PackageInterface; +use crate::package::dumper::ArrayDumper; +use crate::package::loader::ArrayLoader; +use crate::package::version::VersionParser; +use crate::util::Platform; use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; -use shirabe_semver::constraint::constraint_interface::ConstraintInterface; +use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; +use shirabe_semver::constraint::ConstraintInterface; use shirabe_semver::intervals::Intervals; #[derive(Debug)] diff --git a/crates/shirabe/src/package/version/version_guesser.rs b/crates/shirabe/src/package/version/version_guesser.rs index c229c97..51a54e0 100644 --- a/crates/shirabe/src/package/version/version_guesser.rs +++ b/crates/shirabe/src/package/version/version_guesser.rs @@ -2,8 +2,8 @@ use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; -use shirabe_external_packages::symfony::component::process::process::Process; +use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; +use shirabe_external_packages::symfony::component::process::Process; use shirabe_php_shim::{ PHP_INT_MAX, PhpMixed, RuntimeException, array_keys, array_map, array_merge, empty, function_exists, implode, is_string, json_encode, preg_quote, str_replace, strlen, @@ -12,15 +12,15 @@ use shirabe_php_shim::{ use shirabe_semver::version_parser::VersionParser as SemverVersionParser; use crate::config::Config; -use crate::io::io_interface::IOInterface; -use crate::io::null_io::NullIO; -use crate::package::version::version_parser::VersionParser; -use crate::repository::vcs::hg_driver::HgDriver; -use crate::util::git::Git as GitUtil; -use crate::util::http_downloader::HttpDownloader; -use crate::util::platform::Platform; -use crate::util::process_executor::ProcessExecutor; -use crate::util::svn::Svn as SvnUtil; +use crate::io::IOInterface; +use crate::io::NullIO; +use crate::package::version::VersionParser; +use crate::repository::vcs::HgDriver; +use crate::util::Git as GitUtil; +use crate::util::HttpDownloader; +use crate::util::Platform; +use crate::util::ProcessExecutor; +use crate::util::Svn as SvnUtil; /// Try to guess the current version number based on different VCS configuration. /// @@ -518,8 +518,9 @@ impl VersionGuesser { strnatcasecmp(b, a) }); - let mut promises: Vec<Box<dyn shirabe_external_packages::react::promise::promise_interface::PromiseInterface>> = - vec![]; + let mut promises: Vec< + Box<dyn shirabe_external_packages::react::promise::PromiseInterface>, + > = vec![]; self.process.borrow_mut().set_max_jobs(30); // TODO(phase-b): try/finally with resetMaxJobs let result: Result<()> = (|| -> Result<()> { diff --git a/crates/shirabe/src/package/version/version_parser.rs b/crates/shirabe/src/package/version/version_parser.rs index 4286419..46a2356 100644 --- a/crates/shirabe/src/package/version/version_parser.rs +++ b/crates/shirabe/src/package/version/version_parser.rs @@ -3,12 +3,12 @@ use indexmap::IndexMap; use std::sync::{Arc, LazyLock, Mutex}; -use shirabe_external_packages::composer::pcre::preg::Preg; -use shirabe_semver::constraint::constraint_interface::ConstraintInterface; +use shirabe_external_packages::composer::pcre::Preg; +use shirabe_semver::constraint::ConstraintInterface; use shirabe_semver::semver::Semver; use shirabe_semver::version_parser::VersionParser as SemverVersionParser; -use crate::repository::platform_repository::PlatformRepository; +use crate::repository::PlatformRepository; static CONSTRAINTS: LazyLock<Mutex<IndexMap<String, Arc<dyn ConstraintInterface + Send + Sync>>>> = LazyLock::new(|| Mutex::new(IndexMap::new())); diff --git a/crates/shirabe/src/package/version/version_selector.rs b/crates/shirabe/src/package/version/version_selector.rs index 6496dea..832f64c 100644 --- a/crates/shirabe/src/package/version/version_selector.rs +++ b/crates/shirabe/src/package/version/version_selector.rs @@ -4,27 +4,27 @@ use crate::io::io_interface; use std::any::Any; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::Preg; +use shirabe_external_packages::composer::pcre::Preg; use shirabe_php_shim::{ PHP_MAJOR_VERSION, PHP_MINOR_VERSION, PHP_RELEASE_VERSION, strtolower, version_compare, }; -use shirabe_semver::constraint::constraint::Constraint; -use shirabe_semver::constraint::constraint_interface::ConstraintInterface; +use shirabe_semver::constraint::Constraint; +use shirabe_semver::constraint::ConstraintInterface; -use crate::filter::platform_requirement_filter::ignore_all_platform_requirement_filter::IgnoreAllPlatformRequirementFilter; -use crate::filter::platform_requirement_filter::ignore_list_platform_requirement_filter::IgnoreListPlatformRequirementFilter; -use crate::filter::platform_requirement_filter::platform_requirement_filter_factory::PlatformRequirementFilterFactory; -use crate::filter::platform_requirement_filter::platform_requirement_filter_interface::PlatformRequirementFilterInterface; -use crate::io::io_interface::IOInterface; -use crate::package::alias_package::AliasPackage; +use crate::filter::platform_requirement_filter::IgnoreAllPlatformRequirementFilter; +use crate::filter::platform_requirement_filter::IgnoreListPlatformRequirementFilter; +use crate::filter::platform_requirement_filter::PlatformRequirementFilterFactory; +use crate::filter::platform_requirement_filter::PlatformRequirementFilterInterface; +use crate::io::IOInterface; +use crate::package::AliasPackage; +use crate::package::PackageInterface; use crate::package::base_package::{self, BasePackage}; -use crate::package::dumper::array_dumper::ArrayDumper; -use crate::package::loader::array_loader::ArrayLoader; -use crate::package::package_interface::PackageInterface; -use crate::package::version::version_parser::VersionParser; -use crate::repository::platform_repository::PlatformRepository; -use crate::repository::repository_interface::RepositoryInterface; -use crate::repository::repository_set::RepositorySet; +use crate::package::dumper::ArrayDumper; +use crate::package::loader::ArrayLoader; +use crate::package::version::VersionParser; +use crate::repository::PlatformRepository; +use crate::repository::RepositoryInterface; +use crate::repository::RepositorySet; #[derive(Debug)] pub struct VersionSelector { @@ -36,7 +36,7 @@ pub struct VersionSelector { impl VersionSelector { pub fn new( repository_set: RepositorySet, - platform_repo: Option<&crate::repository::platform_repository::PlatformRepository>, + platform_repo: Option<&crate::repository::PlatformRepository>, ) -> anyhow::Result<Self> { let mut platform_constraints: IndexMap<String, Vec<Box<dyn ConstraintInterface>>> = IndexMap::new(); |