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) --- .../src/installer/suggested_packages_reporter.rs | 32 +++++++++++++--------- 1 file changed, 19 insertions(+), 13 deletions(-) (limited to 'crates/shirabe/src/installer') diff --git a/crates/shirabe/src/installer/suggested_packages_reporter.rs b/crates/shirabe/src/installer/suggested_packages_reporter.rs index 087e1b5..b2f8876 100644 --- a/crates/shirabe/src/installer/suggested_packages_reporter.rs +++ b/crates/shirabe/src/installer/suggested_packages_reporter.rs @@ -53,11 +53,11 @@ impl SuggestedPackagesReporter { pub fn output( &self, mode: i64, - installed_repo: Option<&InstalledRepository>, + mut installed_repo: Option<&mut InstalledRepository>, only_dependents_of: Option, - ) { - let suggested_packages = - self.get_filtered_suggestions(installed_repo, only_dependents_of.clone()); + ) -> anyhow::Result<()> { + let suggested_packages = self + .get_filtered_suggestions(installed_repo.as_deref_mut(), only_dependents_of.clone())?; let mut suggesters: IndexMap> = IndexMap::new(); let mut suggested: IndexMap> = IndexMap::new(); @@ -80,7 +80,7 @@ impl SuggestedPackagesReporter { self.io.write(&format!("{}", name)); } - return; + return Ok(()); } // Grouped by package @@ -132,37 +132,43 @@ impl SuggestedPackagesReporter { } if let Some(only_dependents_of) = only_dependents_of { - let all_suggested_packages = self.get_filtered_suggestions(installed_repo, None); + let all_suggested_packages = + self.get_filtered_suggestions(installed_repo.as_deref_mut(), None)?; let diff = all_suggested_packages.len() as i64 - suggested_packages.len() as i64; if diff != 0 { self.io.write(&format!("{} additional suggestions by transitive dependencies can be shown with --all", diff)); } } + + Ok(()) } pub fn output_minimalistic( &self, - installed_repo: Option<&InstalledRepository>, + installed_repo: Option<&mut InstalledRepository>, only_dependents_of: Option, - ) { - let suggested_packages = self.get_filtered_suggestions(installed_repo, only_dependents_of); + ) -> anyhow::Result<()> { + let suggested_packages = + self.get_filtered_suggestions(installed_repo, only_dependents_of)?; if !suggested_packages.is_empty() { self.io.write_error(&format!( "{} package suggestions were added by new dependencies, use `composer suggest` to see details.", suggested_packages.len() )); } + + Ok(()) } fn get_filtered_suggestions( &self, - installed_repo: Option<&InstalledRepository>, + installed_repo: Option<&mut InstalledRepository>, only_dependents_of: Option, - ) -> Vec> { + ) -> anyhow::Result>> { let suggested_packages = self.get_packages(); let mut installed_names: Vec = Vec::new(); if installed_repo.is_some() && !suggested_packages.is_empty() { - for package in installed_repo.unwrap().get_packages() { + for package in installed_repo.unwrap().get_packages()? { installed_names.extend(package.get_names(true)); } } @@ -190,7 +196,7 @@ impl SuggestedPackagesReporter { suggestions.push(suggestion.clone()); } - suggestions + Ok(suggestions) } fn escape_output(&self, string: &str) -> String { -- cgit v1.3.1