diff options
Diffstat (limited to 'crates')
31 files changed, 67 insertions, 135 deletions
diff --git a/crates/shirabe-external-packages/src/composer/mod.rs b/crates/shirabe-external-packages/src/composer/mod.rs index 0fcd787..c70fa2a 100644 --- a/crates/shirabe-external-packages/src/composer/mod.rs +++ b/crates/shirabe-external-packages/src/composer/mod.rs @@ -1,11 +1,9 @@ pub mod ca_bundle; pub mod pcre; -pub mod semver; pub mod util; pub mod xdebug_handler; pub use ca_bundle::*; pub use pcre::*; -pub use semver::*; pub use util::*; pub use xdebug_handler::*; diff --git a/crates/shirabe-external-packages/src/composer/semver/compiling_matcher.rs b/crates/shirabe-external-packages/src/composer/semver/compiling_matcher.rs deleted file mode 100644 index b113f71..0000000 --- a/crates/shirabe-external-packages/src/composer/semver/compiling_matcher.rs +++ /dev/null @@ -1,24 +0,0 @@ -//! ref: composer/vendor/composer/semver/src/CompilingMatcher.php - -use shirabe_semver::constraint::AnyConstraint; - -#[derive(Debug)] -pub struct CompilingMatcher; - -impl CompilingMatcher { - pub fn r#match(_constraint: &AnyConstraint, _package: &dyn std::any::Any) -> bool { - todo!() - } - - pub fn matches(_constraint: &AnyConstraint, _operator: i64, _version: &str) -> bool { - todo!() - } - - pub fn match_(_constraint: &AnyConstraint, _operator: i64, _version: &str) -> bool { - todo!() - } - - pub fn clear() { - todo!() - } -} diff --git a/crates/shirabe-external-packages/src/composer/semver/intervals.rs b/crates/shirabe-external-packages/src/composer/semver/intervals.rs deleted file mode 100644 index 0bf0be3..0000000 --- a/crates/shirabe-external-packages/src/composer/semver/intervals.rs +++ /dev/null @@ -1,32 +0,0 @@ -//! ref: composer/vendor/composer/semver/src/Intervals.php - -use shirabe_php_shim::PhpMixed; -use shirabe_semver::constraint::AnyConstraint; - -#[derive(Debug)] -pub struct Intervals; - -impl Intervals { - pub fn is_subset_of( - _constraint_a: &AnyConstraint, - _constraint_b: &AnyConstraint, - ) -> anyhow::Result<bool> { - todo!() - } - - pub fn compact_constraint(_constraint: AnyConstraint) -> AnyConstraint { - todo!() - } - - pub fn compact(_constraint: &AnyConstraint) -> AnyConstraint { - todo!() - } - - pub fn get(_constraint: &AnyConstraint) -> anyhow::Result<PhpMixed> { - todo!() - } - - pub fn clear() { - todo!() - } -} diff --git a/crates/shirabe-external-packages/src/composer/semver/mod.rs b/crates/shirabe-external-packages/src/composer/semver/mod.rs deleted file mode 100644 index fc6c9c4..0000000 --- a/crates/shirabe-external-packages/src/composer/semver/mod.rs +++ /dev/null @@ -1,7 +0,0 @@ -pub mod compiling_matcher; -pub mod intervals; -pub mod semver; - -pub use compiling_matcher::*; -pub use intervals::*; -pub use semver::*; diff --git a/crates/shirabe-external-packages/src/composer/semver/semver.rs b/crates/shirabe-external-packages/src/composer/semver/semver.rs deleted file mode 100644 index 2051445..0000000 --- a/crates/shirabe-external-packages/src/composer/semver/semver.rs +++ /dev/null @@ -1,18 +0,0 @@ -//! ref: composer/vendor/composer/semver/src/Semver.php - -#[derive(Debug)] -pub struct Semver; - -impl Semver { - pub fn sort(_versions: Vec<String>) -> anyhow::Result<Vec<String>> { - todo!() - } - - pub fn rsort(_versions: Vec<String>) -> Vec<String> { - todo!() - } - - pub fn satisfies(_version: &str, _constraint: &str) -> bool { - todo!() - } -} diff --git a/crates/shirabe-semver/src/lib.rs b/crates/shirabe-semver/src/lib.rs index 04c3e96..dff051c 100644 --- a/crates/shirabe-semver/src/lib.rs +++ b/crates/shirabe-semver/src/lib.rs @@ -1,7 +1,15 @@ -pub mod comparator; -pub mod compiling_matcher; pub mod constraint; -pub mod interval; -pub mod intervals; -pub mod semver; -pub mod version_parser; + +mod comparator; +mod compiling_matcher; +mod interval; +mod intervals; +mod semver; +mod version_parser; + +pub use comparator::*; +pub use compiling_matcher::*; +pub use interval::*; +pub use intervals::*; +pub use semver::*; +pub use version_parser::*; diff --git a/crates/shirabe/src/command/config_command.rs b/crates/shirabe/src/command/config_command.rs index 7dcd6bf..aff950e 100644 --- a/crates/shirabe/src/command/config_command.rs +++ b/crates/shirabe/src/command/config_command.rs @@ -38,7 +38,7 @@ use crate::package::base_package::{self, BasePackage}; use crate::util::Filesystem; use crate::util::Platform; use crate::util::Silencer; -use shirabe_semver::version_parser::VersionParser; +use shirabe_semver::VersionParser; #[derive(Debug)] pub struct ConfigCommand { diff --git a/crates/shirabe/src/command/show_command.rs b/crates/shirabe/src/command/show_command.rs index 6dff0ff..ff348c5 100644 --- a/crates/shirabe/src/command/show_command.rs +++ b/crates/shirabe/src/command/show_command.rs @@ -3,7 +3,6 @@ use anyhow::Result; use indexmap::IndexMap; use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; -use shirabe_external_packages::composer::semver::Semver; use shirabe_external_packages::symfony::console::command::command::Command; use shirabe_external_packages::symfony::console::formatter::OutputFormatter; use shirabe_external_packages::symfony::console::formatter::OutputFormatterStyle; @@ -14,6 +13,7 @@ use shirabe_php_shim::{ array_search, date, date_format_to_strftime, extension_loaded, in_array, realpath, strtolower, version_compare, }; +use shirabe_semver::Semver; use shirabe_spdx_licenses::SpdxLicenses; use std::cell::RefCell; use std::rc::Rc; @@ -1062,7 +1062,7 @@ impl Command for ShowCommand { latest_version_str.trim_start_matches('v').to_string(); } let update_status = - Self::get_update_status(latest.clone(), package.clone()); + Self::get_update_status(latest.clone(), package.clone())?; latest_length = latest_length.max(latest_version_str.len()); package_view_data .insert("latest".to_string(), PhpMixed::String(latest_version_str)); @@ -1544,9 +1544,14 @@ impl ShowCommand { &self, latest_package: PackageInterfaceHandle, package: PackageInterfaceHandle, - ) -> String { - Self::update_status_to_version_style(&Self::get_update_status(latest_package, package)) - .to_string() + ) -> anyhow::Result<String> { + Ok( + Self::update_status_to_version_style(&Self::get_update_status( + latest_package, + package, + )?) + .to_string(), + ) } /// finds a package by name and version if provided @@ -1691,7 +1696,7 @@ impl ShowCommand { )); } let latest: PackageInterfaceHandle = if let Some(latest) = latest_package { - let style = self.get_version_style(latest.clone(), package.clone().into()); + let style = self.get_version_style(latest.clone(), package.clone().into())?; let released_time = match latest.get_release_date() { None => String::new(), Some(rd) => { @@ -1830,7 +1835,7 @@ impl ShowCommand { installed_repo: &mut dyn RepositoryInterface, ) -> anyhow::Result<()> { let mut versions_keys: Vec<String> = versions.keys().cloned().collect(); - versions_keys = Semver::rsort(versions_keys); + versions_keys = Semver::rsort(versions_keys)?; // highlight installed version let installed_packages = installed_repo.find_packages(&package.get_name(), None)?; @@ -2579,11 +2584,11 @@ impl ShowCommand { fn get_update_status( latest_package: PackageInterfaceHandle, package: PackageInterfaceHandle, - ) -> String { + ) -> anyhow::Result<String> { if latest_package.get_full_pretty_version(true, crate::package::DisplayMode::SourceRefIfDev) == package.get_full_pretty_version(true, crate::package::DisplayMode::SourceRefIfDev) { - return "up-to-date".to_string(); + return Ok("up-to-date".to_string()); } let mut constraint = package.get_version().to_string(); @@ -2591,14 +2596,14 @@ impl ShowCommand { constraint = format!("^{}", constraint); } if !latest_package.get_version().is_empty() - && Semver::satisfies(&latest_package.get_version(), &constraint) + && Semver::satisfies(latest_package.get_version(), constraint)? { // it needs an immediate semver-compliant upgrade - return "semver-safe-update".to_string(); + return Ok("semver-safe-update".to_string()); } // it needs an upgrade but has potential BC breaks so is not urgent - "update-possible".to_string() + Ok("update-possible".to_string()) } fn write_tree_line(&mut self, line: &str) { diff --git a/crates/shirabe/src/command/update_command.rs b/crates/shirabe/src/command/update_command.rs index 42622bd..4d8c90a 100644 --- a/crates/shirabe/src/command/update_command.rs +++ b/crates/shirabe/src/command/update_command.rs @@ -13,8 +13,8 @@ use shirabe_php_shim::{ InvalidArgumentException, PhpMixed, RuntimeException, array_filter, array_intersect, array_keys, array_merge_map, array_search_in_vec, count, empty, in_array, sprintf, strtolower, }; +use shirabe_semver::Intervals; use shirabe_semver::constraint::MultiConstraint; -use shirabe_semver::intervals::Intervals; use std::cell::RefCell; use std::rc::Rc; diff --git a/crates/shirabe/src/dependency_resolver/default_policy.rs b/crates/shirabe/src/dependency_resolver/default_policy.rs index 885ff17..863637c 100644 --- a/crates/shirabe/src/dependency_resolver/default_policy.rs +++ b/crates/shirabe/src/dependency_resolver/default_policy.rs @@ -3,7 +3,7 @@ use std::cell::RefCell; use indexmap::IndexMap; -use shirabe_semver::compiling_matcher::CompilingMatcher; +use shirabe_semver::CompilingMatcher; use shirabe_semver::constraint::AnyConstraint; use shirabe_semver::constraint::SimpleConstraint; diff --git a/crates/shirabe/src/dependency_resolver/pool.rs b/crates/shirabe/src/dependency_resolver/pool.rs index 3ea7835..652cf43 100644 --- a/crates/shirabe/src/dependency_resolver/pool.rs +++ b/crates/shirabe/src/dependency_resolver/pool.rs @@ -4,7 +4,7 @@ use std::fmt; use indexmap::IndexMap; use shirabe_php_shim::{STR_PAD_LEFT, str_pad}; -use shirabe_semver::compiling_matcher::CompilingMatcher; +use shirabe_semver::CompilingMatcher; use shirabe_semver::constraint::AnyConstraint; use shirabe_semver::constraint::SimpleConstraint; diff --git a/crates/shirabe/src/dependency_resolver/pool_builder.rs b/crates/shirabe/src/dependency_resolver/pool_builder.rs index c2e328b..650dd6a 100644 --- a/crates/shirabe/src/dependency_resolver/pool_builder.rs +++ b/crates/shirabe/src/dependency_resolver/pool_builder.rs @@ -4,12 +4,12 @@ use crate::io::io_interface; use indexmap::IndexMap; use shirabe_external_packages::composer::pcre::Preg; -use shirabe_external_packages::composer::semver::CompilingMatcher; -use shirabe_external_packages::composer::semver::Intervals; 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, }; +use shirabe_semver::CompilingMatcher; +use shirabe_semver::Intervals; use shirabe_semver::constraint::AnyConstraint; use shirabe_semver::constraint::MatchAllConstraint; use shirabe_semver::constraint::MultiConstraint; @@ -281,10 +281,10 @@ impl PoolBuilder { let mut found = false; for (_idx, package_or_alias) in &package_and_aliases { - if CompilingMatcher::matches( + if CompilingMatcher::r#match( &constraint, SimpleConstraint::OP_EQ, - &package_or_alias.get_version(), + package_or_alias.get_version(), ) { found = true; } @@ -400,13 +400,14 @@ impl PoolBuilder { // extend the constraint to be loaded constraint = Intervals::compact_constraint( - MultiConstraint::create( + &MultiConstraint::create( vec![existing.clone(), constraint.clone()], false, None, ) .unwrap_or_else(|_| MatchAllConstraint::new(None).into()), - ); + ) + .unwrap(); } self.packages_to_load.insert(name.to_string(), constraint); @@ -428,13 +429,14 @@ impl PoolBuilder { self.packages_to_load.insert( name.to_string(), Intervals::compact_constraint( - MultiConstraint::create( + &MultiConstraint::create( vec![self.loaded_packages.get(name).unwrap().clone(), constraint], false, None, ) .unwrap_or_else(|_| MatchAllConstraint::new(None).into()), - ), + ) + .unwrap(), ); self.loaded_packages.shift_remove(name); } diff --git a/crates/shirabe/src/dependency_resolver/pool_optimizer.rs b/crates/shirabe/src/dependency_resolver/pool_optimizer.rs index 2632dc8..46bed91 100644 --- a/crates/shirabe/src/dependency_resolver/pool_optimizer.rs +++ b/crates/shirabe/src/dependency_resolver/pool_optimizer.rs @@ -4,11 +4,11 @@ use std::rc::Rc; use indexmap::IndexMap; use shirabe_php_shim::{PhpMixed, implode, ksort}; -use shirabe_semver::compiling_matcher::CompilingMatcher; +use shirabe_semver::CompilingMatcher; +use shirabe_semver::Intervals; use shirabe_semver::constraint::AnyConstraint; use shirabe_semver::constraint::MultiConstraint; use shirabe_semver::constraint::SimpleConstraint; -use shirabe_semver::intervals::Intervals; use crate::dependency_resolver::PolicyInterface; use crate::dependency_resolver::Pool; diff --git a/crates/shirabe/src/filter/platform_requirement_filter/ignore_list_platform_requirement_filter.rs b/crates/shirabe/src/filter/platform_requirement_filter/ignore_list_platform_requirement_filter.rs index 4255af7..1ceaa56 100644 --- a/crates/shirabe/src/filter/platform_requirement_filter/ignore_list_platform_requirement_filter.rs +++ b/crates/shirabe/src/filter/platform_requirement_filter/ignore_list_platform_requirement_filter.rs @@ -1,12 +1,12 @@ //! ref: composer/src/Composer/Filter/PlatformRequirementFilter/IgnoreListPlatformRequirementFilter.php use shirabe_external_packages::composer::pcre::Preg; +use shirabe_semver::Interval; +use shirabe_semver::Intervals; use shirabe_semver::constraint::AnyConstraint; use shirabe_semver::constraint::MatchAllConstraint; use shirabe_semver::constraint::MultiConstraint; use shirabe_semver::constraint::SimpleConstraint; -use shirabe_semver::interval::Interval; -use shirabe_semver::intervals::Intervals; use crate::filter::platform_requirement_filter::PlatformRequirementFilterInterface; use crate::package::base_package::{self, BasePackage}; diff --git a/crates/shirabe/src/installed_versions.rs b/crates/shirabe/src/installed_versions.rs index 33286ad..3e43f90 100644 --- a/crates/shirabe/src/installed_versions.rs +++ b/crates/shirabe/src/installed_versions.rs @@ -8,7 +8,7 @@ use shirabe_php_shim::{ OutOfBoundsException, PhpMixed, array_flip, array_keys, array_merge, call_user_func_array, implode, is_file, method_exists, php_dir, require_php_file, strtr_array, substr, }; -use shirabe_semver::version_parser::VersionParser; +use shirabe_semver::VersionParser; use crate::autoload::ClassLoader; diff --git a/crates/shirabe/src/installer.rs b/crates/shirabe/src/installer.rs index d1e839d..7445931 100644 --- a/crates/shirabe/src/installer.rs +++ b/crates/shirabe/src/installer.rs @@ -758,7 +758,7 @@ impl Installer { return Ok(exit_code); } - shirabe_semver::compiling_matcher::CompilingMatcher::clear(); + shirabe_semver::CompilingMatcher::clear(); // write lock let platform_reqs = self.extract_platform_requirements(&self.package.get_requires()); diff --git a/crates/shirabe/src/package/loader/validating_array_loader.rs b/crates/shirabe/src/package/loader/validating_array_loader.rs index 57055eb..8081664 100644 --- a/crates/shirabe/src/package/loader/validating_array_loader.rs +++ b/crates/shirabe/src/package/loader/validating_array_loader.rs @@ -10,10 +10,10 @@ use shirabe_php_shim::{ parse_url_all, php_to_string, sprintf, str_replace, strcasecmp, strtolower, strtotime, substr, trigger_error, trim, var_export, }; +use shirabe_semver::Intervals; use shirabe_semver::constraint::AnyConstraint; use shirabe_semver::constraint::MatchNoneConstraint; use shirabe_semver::constraint::SimpleConstraint; -use shirabe_semver::intervals::Intervals; use shirabe_spdx_licenses::SpdxLicenses; use crate::package::loader::InvalidPackageException; diff --git a/crates/shirabe/src/package/version/version_bumper.rs b/crates/shirabe/src/package/version/version_bumper.rs index 2f4e513..c029e3b 100644 --- a/crates/shirabe/src/package/version/version_bumper.rs +++ b/crates/shirabe/src/package/version/version_bumper.rs @@ -8,8 +8,8 @@ use crate::util::Platform; use anyhow::Result; use indexmap::IndexMap; use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; +use shirabe_semver::Intervals; use shirabe_semver::constraint::AnyConstraint; -use shirabe_semver::intervals::Intervals; #[derive(Debug)] pub struct VersionBumper; diff --git a/crates/shirabe/src/package/version/version_guesser.rs b/crates/shirabe/src/package/version/version_guesser.rs index 7f0625f..e13eb5d 100644 --- a/crates/shirabe/src/package/version/version_guesser.rs +++ b/crates/shirabe/src/package/version/version_guesser.rs @@ -9,7 +9,7 @@ use shirabe_php_shim::{ function_exists, implode, is_string, json_encode, preg_quote, str_replace, strlen, strnatcasecmp, strpos, substr, trim, usort, }; -use shirabe_semver::version_parser::VersionParser as SemverVersionParser; +use shirabe_semver::VersionParser as SemverVersionParser; use crate::config::Config; use crate::io::IOInterface; diff --git a/crates/shirabe/src/package/version/version_parser.rs b/crates/shirabe/src/package/version/version_parser.rs index 87fa6c8..d412d47 100644 --- a/crates/shirabe/src/package/version/version_parser.rs +++ b/crates/shirabe/src/package/version/version_parser.rs @@ -4,9 +4,9 @@ use indexmap::IndexMap; use std::sync::{LazyLock, Mutex}; use shirabe_external_packages::composer::pcre::Preg; +use shirabe_semver::Semver; +use shirabe_semver::VersionParser as SemverVersionParser; use shirabe_semver::constraint::AnyConstraint; -use shirabe_semver::semver::Semver; -use shirabe_semver::version_parser::VersionParser as SemverVersionParser; use crate::repository::PlatformRepository; diff --git a/crates/shirabe/src/repository/composer_repository.rs b/crates/shirabe/src/repository/composer_repository.rs index 9ea4432..4428518 100644 --- a/crates/shirabe/src/repository/composer_repository.rs +++ b/crates/shirabe/src/repository/composer_repository.rs @@ -9,7 +9,7 @@ use shirabe_php_shim::{ parse_url_all, realpath, strtolower, strtr, urlencode, var_export, }; -use shirabe_semver::compiling_matcher::CompilingMatcher; +use shirabe_semver::CompilingMatcher; use shirabe_semver::constraint::AnyConstraint; use shirabe_semver::constraint::MatchAllConstraint; use shirabe_semver::constraint::SimpleConstraint; diff --git a/crates/shirabe/tests/common/test_case.rs b/crates/shirabe/tests/common/test_case.rs index 4902448..9972f32 100644 --- a/crates/shirabe/tests/common/test_case.rs +++ b/crates/shirabe/tests/common/test_case.rs @@ -17,8 +17,8 @@ use shirabe_external_packages::symfony::console::output::console_output_interfac use shirabe_external_packages::symfony::console::output::output_interface::OutputInterface; use shirabe_external_packages::symfony::console::output::stream_output::StreamOutput; use shirabe_php_shim::{PhpMixed, PhpResource}; +use shirabe_semver::VersionParser; use shirabe_semver::constraint::{AnyConstraint, SimpleConstraint}; -use shirabe_semver::version_parser::VersionParser; use std::cell::RefCell; use std::path::PathBuf; use std::rc::Rc; diff --git a/crates/shirabe/tests/downloader/archive_downloader_test.rs b/crates/shirabe/tests/downloader/archive_downloader_test.rs index 7062d48..8c65b08 100644 --- a/crates/shirabe/tests/downloader/archive_downloader_test.rs +++ b/crates/shirabe/tests/downloader/archive_downloader_test.rs @@ -17,7 +17,7 @@ use shirabe::io::null_io::NullIO; use shirabe::package::handle::{CompletePackageHandle, PackageInterfaceHandle}; use shirabe::util::HttpDownloader; use shirabe_php_shim::PhpMixed; -use shirabe_semver::version_parser::VersionParser; +use shirabe_semver::VersionParser; /// ref: TestCase::getPackage (default class CompletePackage) fn get_package(name: &str, version: &str) -> PackageInterfaceHandle { diff --git a/crates/shirabe/tests/downloader/xz_downloader_test.rs b/crates/shirabe/tests/downloader/xz_downloader_test.rs index 973a726..71f3960 100644 --- a/crates/shirabe/tests/downloader/xz_downloader_test.rs +++ b/crates/shirabe/tests/downloader/xz_downloader_test.rs @@ -16,7 +16,7 @@ use shirabe::util::ProcessExecutor; use shirabe::util::filesystem::Filesystem; use shirabe::util::r#loop::Loop; use shirabe_php_shim::PhpMixed; -use shirabe_semver::version_parser::VersionParser; +use shirabe_semver::VersionParser; use tempfile::TempDir; /// ref: TestCase::getPackage (default class CompletePackage) diff --git a/crates/shirabe/tests/installed_versions_test.rs b/crates/shirabe/tests/installed_versions_test.rs index 622a796..20c3a85 100644 --- a/crates/shirabe/tests/installed_versions_test.rs +++ b/crates/shirabe/tests/installed_versions_test.rs @@ -9,7 +9,7 @@ use indexmap::IndexMap; use shirabe::installed_versions::InstalledVersions; use shirabe_php_shim::{PhpMixed, realpath}; -use shirabe_semver::version_parser::VersionParser; +use shirabe_semver::VersionParser; use tempfile::TempDir; fn arr(entries: Vec<(&str, PhpMixed)>) -> PhpMixed { diff --git a/crates/shirabe/tests/package/base_package_test.rs b/crates/shirabe/tests/package/base_package_test.rs index 16d3a5b..bd29eaa 100644 --- a/crates/shirabe/tests/package/base_package_test.rs +++ b/crates/shirabe/tests/package/base_package_test.rs @@ -4,7 +4,7 @@ use shirabe::package::DisplayMode; use shirabe::package::base_package::package_names_to_regexp; use shirabe::package::handle::PackageHandle; use shirabe::repository::{ArrayRepository, RepositoryInterfaceHandle}; -use shirabe_semver::version_parser::VersionParser; +use shirabe_semver::VersionParser; use crate::test_case::get_package; diff --git a/crates/shirabe/tests/package/complete_package_test.rs b/crates/shirabe/tests/package/complete_package_test.rs index 4414aba..d985e25 100644 --- a/crates/shirabe/tests/package/complete_package_test.rs +++ b/crates/shirabe/tests/package/complete_package_test.rs @@ -2,7 +2,7 @@ use shirabe::package::package::Package; use shirabe::package::package_interface::PackageInterface; -use shirabe_semver::version_parser::VersionParser; +use shirabe_semver::VersionParser; /// Memory package naming, versioning, and marshalling semantics provider /// demonstrates several versioning schemes diff --git a/crates/shirabe/tests/package/dumper/array_dumper_test.rs b/crates/shirabe/tests/package/dumper/array_dumper_test.rs index 1e5fd05..ed4d35a 100644 --- a/crates/shirabe/tests/package/dumper/array_dumper_test.rs +++ b/crates/shirabe/tests/package/dumper/array_dumper_test.rs @@ -4,7 +4,7 @@ use indexmap::IndexMap; use shirabe::package::ArrayDumper; use shirabe::package::handle::{CompletePackageHandle, RootPackageHandle}; use shirabe_php_shim::PhpMixed; -use shirabe_semver::version_parser::VersionParser; +use shirabe_semver::VersionParser; fn set_up() -> ArrayDumper { ArrayDumper::new() diff --git a/crates/shirabe/tests/package/version/version_bumper_test.rs b/crates/shirabe/tests/package/version/version_bumper_test.rs index 2c376fa..4341a44 100644 --- a/crates/shirabe/tests/package/version/version_bumper_test.rs +++ b/crates/shirabe/tests/package/version/version_bumper_test.rs @@ -5,7 +5,7 @@ use shirabe::package::handle::{PackageHandle, PackageInterfaceHandle}; use shirabe::package::package::Package; use shirabe::package::version::version_bumper::VersionBumper; use shirabe_php_shim::PhpMixed; -use shirabe_semver::version_parser::VersionParser; +use shirabe_semver::VersionParser; #[test] #[ignore] diff --git a/crates/shirabe/tests/platform/hhvm_detector_test.rs b/crates/shirabe/tests/platform/hhvm_detector_test.rs index f0a8550..49804e3 100644 --- a/crates/shirabe/tests/platform/hhvm_detector_test.rs +++ b/crates/shirabe/tests/platform/hhvm_detector_test.rs @@ -5,7 +5,7 @@ use shirabe::util::Platform; use shirabe::util::ProcessExecutor; use shirabe_external_packages::symfony::process::ExecutableFinder; use shirabe_php_shim::{PhpMixed, constant, defined}; -use shirabe_semver::version_parser::VersionParser; +use shirabe_semver::VersionParser; fn set_up() -> HhvmDetector { let hhvm_detector = HhvmDetector::new(None, None); diff --git a/crates/shirabe/tests/platform/version_test.rs b/crates/shirabe/tests/platform/version_test.rs index 3fe0259..009b0a7 100644 --- a/crates/shirabe/tests/platform/version_test.rs +++ b/crates/shirabe/tests/platform/version_test.rs @@ -1,7 +1,7 @@ //! ref: composer/tests/Composer/Test/Platform/VersionTest.php use shirabe::platform::version::Version; -use shirabe_semver::version_parser::VersionParser; +use shirabe_semver::VersionParser; fn provide_openssl_versions() -> Vec<(&'static str, &'static str, bool, Option<&'static str>)> { vec![ |