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/package/locker.rs | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'crates/shirabe/src/package') diff --git a/crates/shirabe/src/package/locker.rs b/crates/shirabe/src/package/locker.rs index e5eed78..327f662 100644 --- a/crates/shirabe/src/package/locker.rs +++ b/crates/shirabe/src/package/locker.rs @@ -28,7 +28,7 @@ use crate::package::version::VersionParser; use crate::plugin::plugin_interface::{self, PluginInterface}; use crate::repository::FindPackageConstraint; use crate::repository::InstalledRepository; -use crate::repository::LockArrayRepository; +use crate::repository::LockArrayRepositoryHandle; use crate::repository::PlatformRepository; use crate::repository::RootPackageRepository; use crate::util::Git as GitUtil; @@ -182,10 +182,14 @@ impl Locker { } /// Searches and returns an array of locked packages, retrieved from registered repositories. - pub fn get_locked_repository(&mut self, with_dev_reqs: bool) -> Result { + pub fn get_locked_repository( + &mut self, + with_dev_reqs: bool, + ) -> Result { let lock_data = self.get_lock_data()?; // TODO(phase-b): LockArrayRepository has no `new` constructor yet - let mut packages: LockArrayRepository = todo!("LockArrayRepository::new(vec![])"); + let mut packages: LockArrayRepositoryHandle = + todo!("LockArrayRepositoryHandle::new(LockArrayRepository::new(vec![]))"); let mut locked_packages = lock_data .get("packages") @@ -936,13 +940,13 @@ impl Locker { let mut missing_requirement_info: Vec = vec![]; let mut missing_requirements = false; let mut sets: Vec = vec![SetEntry { - repo: Box::new(self.get_locked_repository(false)?), + repo: self.get_locked_repository(false)?, method: "getRequires".to_string(), description: "Required".to_string(), }]; if include_dev == true { sets.push(SetEntry { - repo: Box::new(self.get_locked_repository(true)?), + repo: self.get_locked_repository(true)?, method: "getDevRequires".to_string(), description: "Required (in require-dev)".to_string(), }); @@ -1045,7 +1049,7 @@ impl Locker { } struct SetEntry { - repo: Box, + repo: LockArrayRepositoryHandle, method: String, description: String, } -- cgit v1.3.1