From da068098e7e1d5ef1d068a834a78545217f72394 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Wed, 24 Jun 2026 01:38:43 +0900 Subject: refactor(semver): re-export shirabe-semver at crate root, drop composer::semver stubs Flatten shirabe-semver's modules into glob re-exports at the crate root and route all consumers through the short paths. Remove the duplicate composer::semver stubs from shirabe-external-packages in favor of the shirabe-semver types. Co-Authored-By: Claude Opus 4.8 (1M context) --- crates/shirabe/src/package/loader/validating_array_loader.rs | 2 +- crates/shirabe/src/package/version/version_bumper.rs | 2 +- crates/shirabe/src/package/version/version_guesser.rs | 2 +- crates/shirabe/src/package/version/version_parser.rs | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'crates/shirabe/src/package') 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; -- cgit v1.3.1