Fix subsubtable order (#9)

Author: koyeung

Cargo.lock

@@ -101,6 +101,14 @@ mod tests {
     mr="vr"
     [demo]
     ed = "ed"
+    [tool.coverage.report]
+    cd="de"
+    [tool.coverage]
+    aa = "bb"
+    [tool.coverage.paths]
+    ab="bc"
+    [tool.coverage.run]
+    ef="fg"
     [tool.pytest]
     mk="mv"
     "#},
@@ -129,6 +137,15 @@ mod tests {
     [tool.pytest]
     mk = "mv"
 
+    [tool.coverage]
+    aa = "bb"
+    [tool.coverage.report]
+    cd = "de"
+    [tool.coverage.paths]
+    ab = "bc"
+    [tool.coverage.run]
+    ef = "fg"
+
     [tool.mypy]
     mk = "mv"
 

rust/src/global.rs

@@ -87,18 +87,23 @@ fn calculate_order(header_to_pos: &HashMap<String, usize>, ordering: &[&str]) ->
         .map(|(k, v)| (v, k * 2))
         .collect::<HashMap<&&str, usize>>();
 
-    let mut order: Vec<String> = header_to_pos.clone().into_keys().collect();
-    order.sort_by_cached_key(|k| -> usize {
+    let mut header_pos: Vec<(String, usize)> = header_to_pos.clone().into_iter().collect();
+
+    header_pos.sort_by_cached_key(|(k, file_pos)| -> (usize, usize) {
         let key = get_key(k);
         let pos = key_to_pos.get(&key.as_str());
-        if pos.is_some() {
-            let offset = usize::from(key != *k);
-            pos.unwrap() + offset
-        } else {
-            max_ordering + header_to_pos[k]
-        }
+
+        (
+            if let Some(&pos) = pos {
+                let offset = usize::from(key != *k);
+                pos + offset
+            } else {
+                max_ordering
+            },
+            *file_pos,
+        )
     });
-    order
+    header_pos.into_iter().map(|(k, _)| k).collect()
 }
 
 fn get_key(k: &str) -> String {

rust/src/helpers/table.rs

@@ -177,6 +177,37 @@ mod tests {
         true,
         (3, 8)
     )]
+    #[case::subsubtable(
+        indoc ! {r#"
+    [project]
+    [tool.coverage.report]
+    a = 2
+    [tool.coverage]
+    a = 0
+    [tool.coverage.paths]
+    a = 1
+    [tool.coverage.run]
+    a = 3
+    "#},
+        indoc ! {r#"
+    [project]
+    classifiers = [
+      "Programming Language :: Python :: 3 :: Only",
+      "Programming Language :: Python :: 3.8",
+    ]
+    [tool.coverage]
+    a = 0
+    [tool.coverage.report]
+    a = 2
+    [tool.coverage.paths]
+    a = 1
+    [tool.coverage.run]
+    a = 3
+    "#},
+        2,
+        true,
+        (3, 8)
+    )]
     fn test_format_toml(
         #[case] start: &str,
         #[case] expected: &str,