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-test-harness/src/parser.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'crates/mozart-test-harness/src/parser.rs') diff --git a/crates/mozart-test-harness/src/parser.rs b/crates/mozart-test-harness/src/parser.rs index dbc71ae..827272b 100644 --- a/crates/mozart-test-harness/src/parser.rs +++ b/crates/mozart-test-harness/src/parser.rs @@ -1,5 +1,5 @@ use anyhow::{Context, Result, bail}; -use std::collections::HashMap; +use indexmap::IndexMap; use std::fs; use std::path::Path; @@ -53,7 +53,7 @@ pub fn parse_test_str(content: &str) -> Result { } } - let mut take = |key: &str| sections.remove(key); + let mut take = |key: &str| sections.shift_remove(key); let test = take("TEST").unwrap(); let composer = take("COMPOSER").unwrap(); @@ -86,10 +86,10 @@ pub fn parse_test_str(content: &str) -> Result { }) } -fn split_sections(content: &str) -> Result> { +fn split_sections(content: &str) -> Result> { let header_re = regex::Regex::new(r"^--([A-Z][A-Z-]*)--$").unwrap(); - let mut sections: HashMap = HashMap::new(); + let mut sections: IndexMap = IndexMap::new(); let mut current_section: Option = None; let mut current_body = String::new(); -- cgit v1.3.1