From 86fcc80b348a3f00ab81e5447924aa10202d95e8 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Fri, 29 May 2026 03:42:14 +0900 Subject: refactor(repository): introduce typed LockArrayRepositoryHandle Share LockArrayRepository via Rc> while preserving the PHP ?LockArrayRepository type strength: Request.locked_repository, Locker ::get_locked_repository, and the installer create_* helpers now thread the typed handle instead of an owned LockArrayRepository, and pool builder identity check becomes a strict ptr_eq via widening into RepositoryInterfaceHandle. Co-Authored-By: Claude Opus 4.7 (1M context) --- crates/shirabe/src/dependency_resolver/request.rs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'crates/shirabe/src/dependency_resolver/request.rs') diff --git a/crates/shirabe/src/dependency_resolver/request.rs b/crates/shirabe/src/dependency_resolver/request.rs index 0621775..df26535 100644 --- a/crates/shirabe/src/dependency_resolver/request.rs +++ b/crates/shirabe/src/dependency_resolver/request.rs @@ -6,8 +6,7 @@ use shirabe_semver::constraint::AnyConstraint; use shirabe_semver::constraint::MatchAllConstraint; use crate::package::BasePackageHandle; -use crate::repository::CanonicalPackagesTrait; -use crate::repository::LockArrayRepository; +use crate::repository::LockArrayRepositoryHandle; use crate::repository::RepositoryInterface; /// Identifies a partial update for listed packages only, all dependencies will remain at locked versions @@ -41,7 +40,7 @@ pub enum UpdateAllowTransitiveDeps { #[derive(Debug)] pub struct Request { - pub(crate) locked_repository: Option, + pub(crate) locked_repository: Option, pub(crate) requires: IndexMap, pub(crate) fixed_packages: IndexMap, pub(crate) locked_packages: IndexMap, @@ -52,7 +51,7 @@ pub struct Request { } impl Request { - pub fn new(locked_repository: Option) -> Self { + pub fn new(locked_repository: Option) -> Self { Self { locked_repository, requires: IndexMap::new(), @@ -200,7 +199,7 @@ impl Request { let mut present_map: IndexMap = IndexMap::new(); if let Some(ref locked_repository) = self.locked_repository { - for package in RepositoryInterface::get_packages(locked_repository) { + for package in RepositoryInterface::get_packages(&*locked_repository.borrow()) { let key = if package_ids { package.get_id().to_string() } else { @@ -230,8 +229,8 @@ impl Request { fixed_packages_map } - pub fn get_locked_repository(&self) -> Option<&LockArrayRepository> { - self.locked_repository.as_ref() + pub fn get_locked_repository(&self) -> Option { + self.locked_repository.clone() } /// Restricts the pool builder from loading other packages than those listed here. -- cgit v1.3.1