From ec01b3c7da7fb33f3be0dc66ad118553f41d1935 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 9 Jul 2021 14:00:50 +0100
Subject: [PATCH] jstest: lower: move template to bottom, out of the way

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 jstest/jst-lower.rs | 89 ++++++++++++++++++++++-----------------------
 1 file changed, 44 insertions(+), 45 deletions(-)

diff --git a/jstest/jst-lower.rs b/jstest/jst-lower.rs
index 37f613ad..ab8fd3eb 100644
--- a/jstest/jst-lower.rs
+++ b/jstest/jst-lower.rs
@@ -82,51 +82,6 @@ impl Test {
   }
 }
 
-static TEMPLATE: &'static str = r#"
-//-------------------- {{ name }} --------------------
-
-jstest_did = fs.openSync('{{ name }}.did', 'w');
-
-pieces = {
-{% for p in pieces -%}
-  '{{ p.0 }}': {
-    pinned: {{ p.1.pinned }},
-    moveable: '{{ p.1.moveable }}',
-    z: '{{ p.1.z }}',
-  },
-{% endfor -%}
-}
-
-fake_dom = [
-  { special: "pieces_marker", dataset: { } },
-{% for p in pieces -%}
-  { dataset: { piece: "{{ p.0 }}" } },
-{% endfor -%}
-  { special: "defs_marker", dataset: { } },
-];
-
-pieces_marker = fake_dom[0];
-defs_marker   = fake_dom[{{ pieces | length + 1 }}];
-
-{% for p in pieces -%}
-fake_dom[{{ loop.index0 }}].nextElementSibling = fake_dom[{{ loop.index }}];
-{% endfor %}
-fake_dom[{{ pieces | length }}].nextElementSibling = fake_dom[{{ pieces | length + 1 }}];
-
-{% for t in targets -%}
-uorecord = {
-  targets: ['{{ t }}'],
-};
-{%- endfor %}
-
-lower_targets(uorecord);
-
-fs.closeSync(jstest_did);
-jstest_did = -1;
-
-"#;
-
-
 impl TestsAccumulator {
   #[throws(Explode)]
   pub fn new(opts: &Opts) -> Self {
@@ -207,3 +162,47 @@ fn main() {
     test.check()?;
   }
 }
+
+static TEMPLATE: &'static str = r#"
+//-------------------- {{ name }} --------------------
+
+jstest_did = fs.openSync('{{ name }}.did', 'w');
+
+pieces = {
+{% for p in pieces -%}
+  '{{ p.0 }}': {
+    pinned: {{ p.1.pinned }},
+    moveable: '{{ p.1.moveable }}',
+    z: '{{ p.1.z }}',
+  },
+{% endfor -%}
+}
+
+fake_dom = [
+  { special: "pieces_marker", dataset: { } },
+{% for p in pieces -%}
+  { dataset: { piece: "{{ p.0 }}" } },
+{% endfor -%}
+  { special: "defs_marker", dataset: { } },
+];
+
+pieces_marker = fake_dom[0];
+defs_marker   = fake_dom[{{ pieces | length + 1 }}];
+
+{% for p in pieces -%}
+fake_dom[{{ loop.index0 }}].nextElementSibling = fake_dom[{{ loop.index }}];
+{% endfor %}
+fake_dom[{{ pieces | length }}].nextElementSibling = fake_dom[{{ pieces | length + 1 }}];
+
+{% for t in targets -%}
+uorecord = {
+  targets: ['{{ t }}'],
+};
+{%- endfor %}
+
+lower_targets(uorecord);
+
+fs.closeSync(jstest_did);
+jstest_did = -1;
+
+"#;
-- 
2.30.2