refactor!: use IndexMaps instead of BTreeMaps for test and subtest order

Author: ErichDonGubler

Cargo.lock

@@ -24,7 +24,7 @@ enum-map = { version = "2.7.3", features = ["serde"] }
 enumset = { version = "1.1.3", features = ["serde"] }
 env_logger = { workspace = true }
 format = { workspace = true }
-indexmap = { workspace = true }
+indexmap = { workspace = true, features = ["serde"] }
 itertools = "0.11.0"
 joinery = "3.1.0"
 lets_find_up = "0.0.3"

moz-webgpu-cts/Cargo.toml

@@ -46,7 +46,7 @@ where
 #[derive(Debug, Default)]
 pub(crate) struct TestEntry {
     pub entry: Entry<TestOutcome>,
-    pub subtests: BTreeMap<String, Entry<SubtestOutcome>>,
+    pub subtests: IndexMap<String, Entry<SubtestOutcome>>,
 }
 
 #[derive(Debug)]
@@ -565,7 +565,7 @@ pub(crate) fn process_reports(
                         },
                     ))
                 })
-                .collect::<BTreeMap<_, _>>();
+                .collect::<IndexMap<_, _>>();
 
             Some((test_entry_path, (properties, subtests)))
         },

moz-webgpu-cts/src/process_reports.rs

@@ -1,5 +1,4 @@
 use std::{
-    collections::BTreeMap,
     fmt::{self, Display, Formatter},
     hash::Hash,
 };
@@ -8,6 +7,7 @@ use clap::ValueEnum;
 use enum_map::Enum;
 use enumset::EnumSetType;
 use format::lazy_format;
+use indexmap::IndexMap;
 use joinery::JoinableIterator;
 use maybe_collapsed::MaybeCollapsed;
 use serde::{Deserialize, Serialize};
@@ -43,7 +43,7 @@ pub(crate) mod properties;
 #[derive(Clone, Debug, Default, Serialize)]
 pub struct File {
     pub properties: FileProps,
-    pub tests: BTreeMap<SectionHeader, Test>,
+    pub tests: IndexMap<SectionHeader, Test>,
 }
 
 impl File {
@@ -647,7 +647,7 @@ impl ImplementationStatus {
 }
 
 #[derive(Debug, Default)]
-pub struct Tests(BTreeMap<SectionHeader, Test>);
+pub struct Tests(IndexMap<SectionHeader, Test>);
 
 impl<'a> metadata::Tests<'a> for Tests {
     type Test = Test;
@@ -670,7 +670,7 @@ impl<'a> metadata::Tests<'a> for Tests {
 #[derive(Clone, Debug, Default, Serialize)]
 pub struct Test {
     pub properties: TestProps<TestOutcome>,
-    pub subtests: BTreeMap<SectionHeader, Subtest>,
+    pub subtests: IndexMap<SectionHeader, Subtest>,
 }
 
 #[cfg(test)]
@@ -694,7 +694,7 @@ impl metadata::Test<'_> for Test {
 }
 
 #[derive(Default)]
-pub struct Subtests(BTreeMap<SectionHeader, Subtest>);
+pub struct Subtests(IndexMap<SectionHeader, Subtest>);
 
 impl<'a> metadata::Subtests<'a> for Subtests {
     type Subtest = Subtest;