From f31b101ce1e921a026ba234b1f0a83b0392bc118 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Wed, 20 May 2026 08:33:49 +0900 Subject: fix(compile): fix all remaining compile errors Co-Authored-By: Claude Opus 4.7 (1M context) --- crates/shirabe/src/repository/repository_set.rs | 31 ++++++++++++------------- 1 file changed, 15 insertions(+), 16 deletions(-) (limited to 'crates/shirabe/src/repository/repository_set.rs') diff --git a/crates/shirabe/src/repository/repository_set.rs b/crates/shirabe/src/repository/repository_set.rs index 18c3ba6..f39840b 100644 --- a/crates/shirabe/src/repository/repository_set.rs +++ b/crates/shirabe/src/repository/repository_set.rs @@ -30,7 +30,9 @@ use crate::package::complete_alias_package::CompleteAliasPackage; use crate::package::complete_package::CompletePackage; use crate::package::package_interface::PackageInterface; use crate::package::version::stability_filter::StabilityFilter; -use crate::repository::advisory_provider_interface::AdvisoryProviderInterface; +use crate::repository::advisory_provider_interface::{ + AdvisoryProviderInterface, PartialOrSecurityAdvisory, +}; use crate::repository::composite_repository::CompositeRepository; use crate::repository::installed_repository::InstalledRepository; use crate::repository::installed_repository_interface::InstalledRepositoryInterface; @@ -221,7 +223,7 @@ impl RepositorySet { let constraint_clone = constraint .as_ref() .map(|c| FindPackageConstraint::Constraint(c.clone_box())); - let found = repository.find_packages(name.to_string(), constraint_clone); + let found = repository.find_packages(name, constraint_clone); packages.push(found); } } else { @@ -367,8 +369,8 @@ impl RepositorySet { allow_partial_advisories: bool, ignore_unreachable: bool, unreachable_repos: &mut Vec, - ) -> Result>> { - let mut repo_advisories: Vec>> = vec![]; + ) -> Result>> { + let mut repo_advisories: Vec>> = vec![]; for repository in &self.repositories { // TODO(phase-b): use anyhow::Result> to model PHP try/catch let attempt: Result<()> = (|| -> Result<()> { @@ -451,7 +453,7 @@ impl RepositorySet { &mut self, request: Request, io: Box, - event_dispatcher: Option, + event_dispatcher: Option>>, pool_optimizer: Option, ignored_types: Vec, allowed_types: Option>, @@ -474,10 +476,7 @@ impl RepositorySet { pool_builder.set_allowed_types(allowed_types); for repo in &self.repositories { - let is_installed = repo - .as_any() - .downcast_ref::() - .is_some() + let is_installed = repo.as_installed_repository_interface().is_some() || repo .as_any() .downcast_ref::() @@ -494,17 +493,17 @@ impl RepositorySet { self.locked = true; - // TODO(phase-b): pass repositories by reference; pool_builder.build_pool expects &Vec> - pool_builder.build_pool(&self.repositories, &request) + // TODO(phase-b): pool_builder.build_pool takes owned Vec and &mut Request; revisit sharing model + pool_builder.build_pool( + todo!("share self.repositories"), + todo!("share request as &mut"), + ) } /// Create a pool for dependency resolution from the packages in this repository set. pub fn create_pool_with_all_packages(&mut self) -> Result { for repo in &self.repositories { - let is_installed = repo - .as_any() - .downcast_ref::() - .is_some() + let is_installed = repo.as_installed_repository_interface().is_some() || repo .as_any() .downcast_ref::() @@ -643,6 +642,6 @@ impl RepositorySet { #[derive(Debug)] pub struct SecurityAdvisoriesResult { - pub advisories: IndexMap>, + pub advisories: IndexMap>, pub unreachable_repos: Vec, } -- cgit v1.3.1