From 1e7aabcae1b2139aa20a80fbf303c74388933f55 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sat, 6 Jun 2026 15:16:07 +0900 Subject: fix(array-dumper): emit package links and require Link pretty constraint Resolve the phase-b TODO that left the supported-link-types loop as dead code (links were always an empty Vec), so requires/conflicts/provides/ replaces/require-dev are dumped again via PackageInterface::get_links_for_type, matching the PHP magic-call loop. Every Link in production is constructed with a pretty constraint (all ArrayLoader/AliasPackage/PlatformRepository/InstalledRepository sites pass one), so make Link::pretty_constraint a required String instead of Option. get_pretty_constraint() now returns &str directly rather than anyhow::Result<&str>, dropping the unreachable UnexpectedValueException guard, and all call sites are updated. Co-Authored-By: Claude Opus 4.8 --- crates/shirabe/src/repository/installed_repository.rs | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'crates/shirabe/src/repository/installed_repository.rs') diff --git a/crates/shirabe/src/repository/installed_repository.rs b/crates/shirabe/src/repository/installed_repository.rs index e6f022e..b8321d6 100644 --- a/crates/shirabe/src/repository/installed_repository.rs +++ b/crates/shirabe/src/repository/installed_repository.rs @@ -282,11 +282,7 @@ impl InstalledRepository { link.get_target().to_string(), MatchAllConstraint::new(None).into(), Some(Link::TYPE_REQUIRE.to_string()), - Some(format!( - "{} {}", - link.get_pretty_constraint().unwrap_or_default(), - description - )), + format!("{} {}", link.get_pretty_constraint(), description), ), None, )); @@ -351,10 +347,7 @@ impl InstalledRepository { link.get_target().to_string(), MatchAllConstraint::new(None).into(), Some(Link::TYPE_DOES_NOT_REQUIRE.to_string()), - Some(format!( - "but {} is installed", - pkg.get_pretty_version() - )), + format!("but {} is installed", pkg.get_pretty_version()), ), None, )); -- cgit v1.3.1