build: OUT_DIR per-case tree (all.rs aggregates) instead of single file

OUT_DIR/generated/<topic>/<case>.rs (per-case) + all.rs which include!s each. tests/mod.rs does include!(OUT_DIR/generated/all.rs). Nested include! works because inner paths resolve relative to all.rs (which sits next to the <topic>/ dirs). Each per-case fn puts `use crate::TestCtx` inside the fn body so all.rs flat include! does not duplicate the use. Local builds mirror the same tree under tests/generated/; CI (CI=true) and cargo package/publish verify (target/package) skip the mirror. cargo package verify passes (writes only inside OUT_DIR).

Author: TtTRz

float-pigment-forest/build.rs

@@ -3,21 +3,27 @@
 // (create_node / create_text / set_style / append + layout_imperative +
 // getters).
 //
-// Output strategy:
-//   - Always: OUT_DIR/html_tests.rs (single file, all #[test] inlined),
-//     pulled in by tests/mod.rs via `include!`. This is what compiles.
-//   - Local (non-CI, non-publish-verify) builds ALSO mirror per-case .rs
-//     files under tests/generated/<topic>/<case>.rs (+ mod tree) for human
-//     review. CI (CI=true) and `cargo package`/`publish` verify
-//     (CARGO_MANIFEST_DIR under target/package) skip the mirror — CI doesn't
-//     need it, and publish verify forbids build.rs from writing outside
-//     OUT_DIR.
+// Output (per-case .rs under <gen_dir>/<topic>/<case>.rs, not one big file):
+//   - OUT_DIR/generated/<topic>/<case>.rs + OUT_DIR/generated/all.rs
+//     (all.rs does `include!("topic/case.rs")` for each case — paths resolve
+//     relative to all.rs, which lives next to the <topic>/ dirs). tests/mod.rs
+//     pulls all.rs in via `include!(OUT_DIR/generated/all.rs)`. This is what
+//     compiles.
+//   - Local (non-CI, non-publish-verify) builds ALSO write the same tree
+//     under tests/generated/ for human review. CI (CI=true) and cargo
+//     package/publish verify (CARGO_MANIFEST_DIR under target/package) skip
+//     the tests/generated mirror — CI doesn't need it, and publish verify
+//     forbids build.rs from writing outside OUT_DIR.
+//
+// Each per-case .rs puts `use crate::TestCtx;` *inside* the fn so that
+// all.rs's flat include! sequence doesn't trip "duplicate use" — each fn
+// brings TestCtx into its own scope.
 //
 // The translator walks the parsed DOM and emits imperative calls in
 // document order. Layout assertions (data-expect-*) are collected during
 // the walk and emitted after `ctx.layout_imperative()` so they read back
 // computed values.
-use std::{fs, path::PathBuf};
+use std::{collections::BTreeMap, fs, path::{Path, PathBuf}};
 
 use float_pigment_mlp::{
     context::{Context, Parse},
@@ -28,13 +34,10 @@ fn main() {
     let manifest = std::env::var("CARGO_MANIFEST_DIR").unwrap();
     let cases_dir = PathBuf::from(&manifest).join("tests/cases");
     let out = std::env::var("OUT_DIR").unwrap();
-    let output_file = PathBuf::from(&out).join("html_tests.rs");
+    let out_gen = PathBuf::from(&out).join("generated");
 
-    let mut tests = String::from("// AUTO-GENERATED by build.rs. Do not edit.\n\n");
-    // topic -> Vec<(case_name, name_ident, body, ignore)>, used to mirror
-    // per-case .rs files under tests/generated in local builds.
-    let mut by_topic: std::collections::BTreeMap<String, Vec<(String, String, String, bool)>> =
-        std::collections::BTreeMap::new();
+    // topic -> Vec<(case_name, name_ident, body, ignore)>
+    let mut by_topic: BTreeMap<String, Vec<(String, String, String, bool)>> = BTreeMap::new();
 
     if cases_dir.exists() {
         let mut entries = walk(&cases_dir, &cases_dir);
@@ -47,47 +50,44 @@ fn main() {
             let mut parts = rel_str.split('/');
             let topic = parts.next().unwrap_or("misc").to_string();
             let name = parts.collect::<Vec<_>>().join("_");
-            let topic_ident = topic.replace('-', "_");
             let name_ident = name.replace('-', "_");
-            let fn_name = format!("html_{}_{}", topic_ident, name_ident);
             let html = fs::read_to_string(&abs).unwrap_or_default();
             let ignore = html.contains("data-ignore=\"true\"");
-            let ignore_attr = if ignore { "#[ignore]\n" } else { "" };
             let body = translate_html(&html);
-            // OUT_DIR/html_tests.rs — compiled via include! in tests/mod.rs.
-            tests.push_str(&format!(
-                "{ignore_attr}#[test]\nfn {fn_name}() {{\n    use crate::TestCtx;\n{body}}}\n\n"
-            ));
             by_topic
                 .entry(topic)
                 .or_default()
                 .push((name, name_ident, body, ignore));
         }
     }
 
-    fs::write(&output_file, tests).unwrap();
+    // OUT_DIR/generated: per-case .rs + all.rs (compiled). all.rs is always
+    // emitted here; mod.rs/ tree is also emitted (harmless, aids browsing).
+    write_cases_tree(&out_gen, &by_topic, true);
 
-    // Local builds also mirror per-case .rs under tests/generated/ for review.
+    // Local mirror under tests/generated for human review.
     let is_ci = std::env::var("CI").is_ok();
     let is_publish_verify = manifest.contains("target/package");
     if !is_ci && !is_publish_verify {
-        mirror_to_generated(&manifest, &by_topic);
+        let gen_dir = PathBuf::from(&manifest).join("tests/generated");
+        write_cases_tree(&gen_dir, &by_topic, false);
     }
 
     println!("cargo:rerun-if-changed=tests/cases");
     println!("cargo:rerun-if-changed=build.rs");
 }
 
-/// Mirror per-case .rs files (+ nested mod tree) under tests/generated/ for
-/// human review. Not compiled (tests/mod.rs uses the OUT_DIR include!), so
-/// purely for readability.
-fn mirror_to_generated(
-    manifest: &str,
-    by_topic: &std::collections::BTreeMap<String, Vec<(String, String, String, bool)>>,
+/// Write per-case .rs under `<gen_dir>/<topic>/<case>.rs` plus a nested
+/// `mod.rs` tree (browsing aid) and, when `emit_all_rs`, an `all.rs` that
+/// `include!`s every case — that all.rs is what tests/mod.rs compiles.
+fn write_cases_tree(
+    gen_dir: &Path,
+    by_topic: &BTreeMap<String, Vec<(String, String, String, bool)>>,
+    emit_all_rs: bool,
 ) {
-    let gen_dir = PathBuf::from(manifest).join("tests/generated");
-    let _ = fs::remove_dir_all(&gen_dir);
-    fs::create_dir_all(&gen_dir).unwrap();
+    let _ = fs::remove_dir_all(gen_dir);
+    fs::create_dir_all(gen_dir).unwrap();
+    let mut all_rs = String::from("// AUTO-GENERATED by build.rs. Do not edit.\n\n");
     let mut top_mod = String::from("// AUTO-GENERATED by build.rs. Do not edit.\n\n");
     for (topic, cases) in by_topic {
         let topic_dir = gen_dir.join(topic);
@@ -98,15 +98,21 @@ fn mirror_to_generated(
             let fn_name = format!("html_{}_{}", topic_ident, name_ident);
             let ignore_attr = if *ignore { "#[ignore]\n" } else { "" };
             let case_rs = format!(
-                "// AUTO-GENERATED from tests/cases/{topic}/{name}.html. Do not edit.\nuse crate::TestCtx;\n\n{ignore_attr}#[rustfmt::skip]\n#[test]\nfn {fn_name}() {{\n{body}}}\n"
+                "// AUTO-GENERATED from tests/cases/{topic}/{name}.html. Do not edit.\n\n{ignore_attr}#[rustfmt::skip]\n#[test]\nfn {fn_name}() {{\n    use crate::TestCtx;\n{body}}}\n"
             );
-            fs::write(topic_dir.join(format!("{name}.rs")), case_rs).unwrap();
+            fs::write(topic_dir.join(format!("{name}.rs")), &case_rs).unwrap();
+            // all.rs includes each case; path is relative to all.rs (gen_dir),
+            // which sits next to <topic>/, so "<topic>/<case>.rs" resolves.
+            all_rs.push_str(&format!("include!(\"{topic}/{name}.rs\");\n"));
             topic_mod.push_str(&format!("mod {name_ident};\n"));
         }
         fs::write(topic_dir.join("mod.rs"), topic_mod).unwrap();
         top_mod.push_str(&format!("mod {topic_ident};\n"));
     }
     fs::write(gen_dir.join("mod.rs"), top_mod).unwrap();
+    if emit_all_rs {
+        fs::write(gen_dir.join("all.rs"), all_rs).unwrap();
+    }
 }
 
 /// Parse the HTML and emit imperative TestCtx calls.

float-pigment-forest/tests/mod.rs

@@ -677,4 +677,4 @@ fn convert_grid_auto(grid_auto: GridAuto) -> LayoutGridAuto<Len> {
     }
 }
 
-include!(concat!(env!("OUT_DIR"), "/html_tests.rs"));
+include!(concat!(env!("OUT_DIR"), "/generated/all.rs"));