From ae1aa6540761e54a76b8f7984cf93cd3a0d011d0 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sun, 3 May 2026 11:55:03 +0900 Subject: refactor: switch internal maps/sets from HashMap to IndexMap Adopt indexmap workspace-wide so iteration order is deterministic and follows insertion order. The non-deterministic order of std HashMap otherwise leaks into resolver decisions when multiple valid solutions exist (e.g. cyclic require pairs under prefer-lowest), making behavior flaky and divergent from Composer's PHP-array semantics. Co-Authored-By: Claude Opus 4.7 (1M context) --- crates/mozart/src/commands/dependency.rs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'crates/mozart/src/commands/dependency.rs') diff --git a/crates/mozart/src/commands/dependency.rs b/crates/mozart/src/commands/dependency.rs index 6dcaec8..d044432 100644 --- a/crates/mozart/src/commands/dependency.rs +++ b/crates/mozart/src/commands/dependency.rs @@ -4,7 +4,8 @@ //! `prohibits` (aka `why-not`) answers: "Which packages prevent version X of package Y from being //! installed?" -use std::collections::{BTreeMap, HashSet}; +use indexmap::IndexSet; +use std::collections::BTreeMap; use std::path::Path; use anyhow::Result; @@ -233,7 +234,7 @@ fn get_dependents_forward( needles: &[String], recursive: bool, ) -> Result> { - let needle_set: HashSet = needles.iter().map(|n| n.to_lowercase()).collect(); + let needle_set: IndexSet = needles.iter().map(|n| n.to_lowercase()).collect(); // Build name→PackageInfo lookup let pkg_map: BTreeMap = packages @@ -243,7 +244,7 @@ fn get_dependents_forward( if recursive { // Recursive: BFS from needles upward to root, building a tree - let mut visited: HashSet = HashSet::new(); + let mut visited: IndexSet = IndexSet::new(); let mut results: Vec = Vec::new(); for needle in needles { @@ -318,8 +319,8 @@ fn recurse_dependents( packages: &[PackageInfo], needle: &str, pkg_map: &BTreeMap, - visited: &mut HashSet, - _original_needles: &HashSet, + visited: &mut IndexSet, + _original_needles: &IndexSet, ) -> Vec { let _ = pkg_map; // kept for potential future use let direct = collect_direct_requires(packages, needle); @@ -545,7 +546,7 @@ pub fn print_table(results: &[DependencyResult], console: &mozart_core::console: .max() .unwrap_or(0); - let mut seen: HashSet = HashSet::new(); + let mut seen: IndexSet = IndexSet::new(); for r in results { let key = format!( "{}|{}|{}|{}", -- cgit v1.3.1