From 5e31fa33c3b5cf726a57a063b8e7a070869250fe Mon Sep 17 00:00:00 2001 From: nsfisis Date: Tue, 19 May 2026 21:46:01 +0900 Subject: fix(compile): fix more random compile errors Co-Authored-By: Claude Opus 4.7 (1M context) --- .../shirabe/src/repository/canonical_packages_trait.rs | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'crates/shirabe/src/repository/canonical_packages_trait.rs') diff --git a/crates/shirabe/src/repository/canonical_packages_trait.rs b/crates/shirabe/src/repository/canonical_packages_trait.rs index 8fae936..3c9c75c 100644 --- a/crates/shirabe/src/repository/canonical_packages_trait.rs +++ b/crates/shirabe/src/repository/canonical_packages_trait.rs @@ -14,8 +14,12 @@ pub trait CanonicalPackagesTrait { // get at most one package of each name, preferring non-aliased ones let mut packages_by_name: IndexMap> = IndexMap::new(); for package in packages { - let name = package.get_name(); - if !packages_by_name.contains_key(&name) || packages_by_name[&name].is_alias_package() { + let name = package.get_name().to_string(); + let prefer_replace = packages_by_name + .get(&name) + .map(|existing| existing.as_alias_package().is_some()) + .unwrap_or(true); + if prefer_replace { packages_by_name.insert(name, package); } } @@ -23,11 +27,10 @@ pub trait CanonicalPackagesTrait { let mut canonical_packages = Vec::new(); // unfold aliased packages - for mut package in packages_by_name.into_values() { - while package.is_alias_package() { - package = package.get_alias_of(); - } - + for package in packages_by_name.into_values() { + // TODO(phase-b): unfolding requires `Box` traversal of + // `AliasPackage::get_alias_of()` (currently returns `&BasePackage`, not an + // ownable trait object). Push the alias as-is for now. canonical_packages.push(package); } -- cgit v1.3.1