From cd25c3e193f05a5e89bca2a1c706c85fdc9c9155 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sat, 6 Jun 2026 02:13:59 +0900 Subject: refactor(repository): make read methods fallible and take &mut self Change RepositoryInterface and WritableRepositoryInterface read methods (find_package, find_packages, get_packages, load_packages, search, get_providers, get_canonical_packages) to take &mut self and return anyhow::Result, so lazy-loading repositories such as ComposerRepository can perform fallible I/O and mutate internal state on access. Update all implementors and call sites to propagate the Result and pass mutable references. Co-Authored-By: Claude Opus 4.8 (1M context) --- .../shirabe/src/dependency_resolver/pool_builder.rs | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'crates/shirabe/src/dependency_resolver/pool_builder.rs') diff --git a/crates/shirabe/src/dependency_resolver/pool_builder.rs b/crates/shirabe/src/dependency_resolver/pool_builder.rs index 1bbd51e..5750450 100644 --- a/crates/shirabe/src/dependency_resolver/pool_builder.rs +++ b/crates/shirabe/src/dependency_resolver/pool_builder.rs @@ -162,10 +162,12 @@ impl PoolBuilder { .into()); } - let locked_packages = CanonicalPackagesTrait::get_packages( - &*request.get_locked_repository().unwrap().borrow(), - ); - for locked_package in locked_packages { + for locked_package in request + .get_locked_repository() + .unwrap() + .borrow_mut() + .get_canonical_packages()? + { if !self.is_update_allowed(locked_package.clone()) { // Path repo packages are never loaded from lock, to force them to always remain in sync // unless symlinking is disabled in which case we probably should rather treat them like @@ -530,7 +532,7 @@ impl PoolBuilder { .collect() }) .unwrap_or_default(), - ); + )?; let names_found = result.names_found; for name in &names_found { @@ -819,9 +821,12 @@ impl PoolBuilder { let pattern_regexp = base_package::package_name_to_regexp(pattern); // update pattern matches a locked package? => all good - for package in CanonicalPackagesTrait::get_packages( - &*request.get_locked_repository().unwrap().borrow(), - ) { + for package in request + .get_locked_repository() + .unwrap() + .borrow_mut() + .get_canonical_packages()? + { if Preg::is_match3(&pattern_regexp, &package.get_name(), None).unwrap_or(false) { continue 'outer; } -- cgit v1.3.1