From cc5d73c05a0abca2eebcc8a6afa0b1543ee49850 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Wed, 27 May 2026 00:49:33 +0900 Subject: refactor(package): pass package handles by value throughout Co-Authored-By: Claude Opus 4.7 (1M context) --- crates/shirabe/src/package/version/version_bumper.rs | 6 +++--- crates/shirabe/src/package/version/version_selector.rs | 13 +++++++------ 2 files changed, 10 insertions(+), 9 deletions(-) (limited to 'crates/shirabe/src/package/version') diff --git a/crates/shirabe/src/package/version/version_bumper.rs b/crates/shirabe/src/package/version/version_bumper.rs index 8cc4b5d..e54ad10 100644 --- a/crates/shirabe/src/package/version/version_bumper.rs +++ b/crates/shirabe/src/package/version/version_bumper.rs @@ -1,6 +1,6 @@ //! ref: composer/src/Composer/Package/Version/VersionBumper.php -use crate::package::PackageInterface; +use crate::package::PackageInterfaceHandle; use crate::package::dumper::ArrayDumper; use crate::package::loader::ArrayLoader; use crate::package::version::VersionParser; @@ -18,7 +18,7 @@ impl VersionBumper { pub fn bump_requirement( &self, constraint: &AnyConstraint, - package: &dyn PackageInterface, + package: PackageInterfaceHandle, ) -> Result { let parser = VersionParser::new(); let pretty_constraint = constraint.get_pretty_string(); @@ -33,7 +33,7 @@ impl VersionBumper { let _ = &parser; let loader = ArrayLoader::new(None, false); let dumper = ArrayDumper::new(); - let dumped = dumper.dump(package); + let dumped = dumper.dump(package.clone()); let extra = loader.get_branch_alias(&dumped)?; if extra.is_none() || extra.as_deref() == Some(VersionParser::DEFAULT_BRANCH_ALIAS) { diff --git a/crates/shirabe/src/package/version/version_selector.rs b/crates/shirabe/src/package/version/version_selector.rs index 28b9277..99b459e 100644 --- a/crates/shirabe/src/package/version/version_selector.rs +++ b/crates/shirabe/src/package/version/version_selector.rs @@ -16,7 +16,7 @@ use crate::filter::platform_requirement_filter::IgnoreListPlatformRequirementFil use crate::filter::platform_requirement_filter::PlatformRequirementFilterFactory; use crate::filter::platform_requirement_filter::PlatformRequirementFilterInterface; use crate::io::IOInterface; -use crate::package::PackageInterface; +use crate::package::PackageInterfaceHandle; use crate::package::base_package; use crate::package::dumper::ArrayDumper; use crate::package::loader::ArrayLoader; @@ -252,14 +252,15 @@ impl VersionSelector { pub fn find_recommended_require_version( &mut self, - package: &dyn PackageInterface, + package: PackageInterfaceHandle, ) -> anyhow::Result { if package.get_name().starts_with("ext-") { let php_version = format!( "{}.{}.{}", PHP_MAJOR_VERSION, PHP_MINOR_VERSION, PHP_RELEASE_VERSION ); - let ext_parts: Vec<&str> = package.get_version().splitn(4, '.').collect(); + let package_version = package.get_version(); + let ext_parts: Vec<&str> = package_version.splitn(4, '.').collect(); let ext_version = ext_parts[..3.min(ext_parts.len())].join("."); if php_version == ext_version { return Ok("*".to_string()); @@ -270,14 +271,14 @@ impl VersionSelector { if !package.is_dev() { return self.transform_version( &version, - package.get_pretty_version(), - package.get_stability(), + &package.get_pretty_version(), + &package.get_stability(), ); } let loader = ArrayLoader::new(Some(self.get_parser().clone()), false); let dumper = ArrayDumper::new(); - let extra = loader.get_branch_alias(&dumper.dump(package))?; + let extra = loader.get_branch_alias(&dumper.dump(package.clone()))?; if let Some(extra) = extra { if extra != VersionParser::DEFAULT_BRANCH_ALIAS { let new_extra = -- cgit v1.3.1