From 1fe1cd3fe9da3f34d8529a0c4cc89fdc61af5065 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sun, 17 May 2026 17:44:03 +0900 Subject: fix(compile): add dyn keyword to all trait object usages (E0782) Co-Authored-By: Claude Sonnet 4.6 --- crates/shirabe/src/dependency_resolver/pool.rs | 34 +++++++++++++------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'crates/shirabe/src/dependency_resolver/pool.rs') diff --git a/crates/shirabe/src/dependency_resolver/pool.rs b/crates/shirabe/src/dependency_resolver/pool.rs index e86e4c2..5a028a1 100644 --- a/crates/shirabe/src/dependency_resolver/pool.rs +++ b/crates/shirabe/src/dependency_resolver/pool.rs @@ -16,15 +16,15 @@ use crate::package::version::version_parser::VersionParser; #[derive(Debug)] pub struct Pool { /// @var BasePackage[] - pub(crate) packages: Vec>, + pub(crate) packages: Vec>, /// @var array - pub(crate) package_by_name: IndexMap>>, + pub(crate) package_by_name: IndexMap>>, /// @var VersionParser pub(crate) version_parser: VersionParser, /// @var array> - pub(crate) provider_cache: IndexMap>>>, + pub(crate) provider_cache: IndexMap>>>, /// @var BasePackage[] - pub(crate) unacceptable_fixed_or_locked_packages: Vec>, + pub(crate) unacceptable_fixed_or_locked_packages: Vec>, /// @var array> Map of package name => normalized version => pretty version pub(crate) removed_versions: IndexMap>, /// @var array> Map of package object hash => removed normalized versions => removed pretty version @@ -44,8 +44,8 @@ impl Pool { /// @param array>> $securityRemovedVersions /// @param array> $abandonedRemovedVersions pub fn new( - packages: Vec>, - unacceptable_fixed_or_locked_packages: Vec>, + packages: Vec>, + unacceptable_fixed_or_locked_packages: Vec>, removed_versions: IndexMap>, removed_versions_by_package: IndexMap>, security_removed_versions: IndexMap>>, @@ -189,7 +189,7 @@ impl Pool { } /// @param BasePackage[] $packages - fn set_packages(&mut self, packages: Vec>) { + fn set_packages(&mut self, packages: Vec>) { let mut id: i64 = 1; for mut package in packages { @@ -208,12 +208,12 @@ impl Pool { } /// @return BasePackage[] - pub fn get_packages(&self) -> &Vec> { + pub fn get_packages(&self) -> &Vec> { &self.packages } /// Retrieves the package object for a given package id. - pub fn package_by_id(&self, id: i64) -> &BasePackage { + pub fn package_by_id(&self, id: i64) -> &dyn BasePackage { &self.packages[(id - 1) as usize] } @@ -227,7 +227,7 @@ impl Pool { &mut self, name: &str, constraint: Option<&dyn ConstraintInterface>, - ) -> Vec> { + ) -> Vec> { // PHP: $key = (string) $constraint; let key = match constraint { Some(c) => c.to_string(), @@ -255,12 +255,12 @@ impl Pool { &self, name: &str, constraint: Option<&dyn ConstraintInterface>, - ) -> Vec> { + ) -> Vec> { let Some(candidates) = self.package_by_name.get(name) else { return vec![]; }; - let mut matches: Vec> = vec![]; + let mut matches: Vec> = vec![]; for candidate in candidates { if self.r#match(candidate, name, constraint) { @@ -271,7 +271,7 @@ impl Pool { matches } - pub fn literal_to_package(&self, literal: i64) -> &BasePackage { + pub fn literal_to_package(&self, literal: i64) -> &dyn BasePackage { let package_id = abs(literal); self.package_by_id(package_id) @@ -281,7 +281,7 @@ impl Pool { pub fn literal_to_pretty_string( &self, literal: i64, - installed_map: &IndexMap>, + installed_map: &IndexMap>, ) -> String { let package = self.literal_to_package(literal); @@ -304,7 +304,7 @@ impl Pool { /// @param string $name Name of the package to be matched pub fn r#match( &self, - candidate: &BasePackage, + candidate: &dyn BasePackage, name: &str, constraint: Option<&dyn ConstraintInterface>, ) -> bool { @@ -362,7 +362,7 @@ impl Pool { false } - pub fn is_unacceptable_fixed_or_locked_package(&self, package: &BasePackage) -> bool { + pub fn is_unacceptable_fixed_or_locked_package(&self, package: &dyn BasePackage) -> bool { // PHP: \in_array($package, $this->unacceptableFixedOrLockedPackages, true) // strict comparison checks reference identity for objects let target_hash = spl_object_hash(package); @@ -372,7 +372,7 @@ impl Pool { } /// @return BasePackage[] - pub fn get_unacceptable_fixed_or_locked_packages(&self) -> &Vec> { + pub fn get_unacceptable_fixed_or_locked_packages(&self) -> &Vec> { &self.unacceptable_fixed_or_locked_packages } } -- cgit v1.3.1