From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 5 Jul 2020 17:58:01 +0000 (+0100)
Subject: tidying etc
X-Git-Tag: otter-0.2.0~1441
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=7e7b1bca1bec23ce3c508af431d3ee9c23a4b7d1;p=otter.git

tidying etc
---

diff --git a/src/bin/server.rs b/src/bin/server.rs
index afb57935..e9a8ef9f 100644
--- a/src/bin/server.rs
+++ b/src/bin/server.rs
@@ -55,7 +55,7 @@ struct SessionRenderContext {
   player : PlayerId,
   gen : Generation,
   uses : Vec<String>,
-  defs : Vec<(VisiblePieceId,Vec<String>)>,
+  defs : Vec<(VisiblePieceId,String)>,
   nick : String,
 }
 
diff --git a/src/gamestate.rs b/src/gamestate.rs
index fdda66e2..e06c8c92 100644
--- a/src/gamestate.rs
+++ b/src/gamestate.rs
@@ -61,16 +61,16 @@ pub struct PieceRecord {
 }
 
 impl PieceRecord {
-  pub fn make_defs(&self, pri : &PieceRenderInstructions) -> Vec<String> {
+  pub fn make_defs(&self, pri : &PieceRenderInstructions) -> String {
     let pr = self;
-    let mut defs = vec![];
-    defs.push(format!(r##"<g id="{}">{}</g>"##,
-                      pri.id_piece(),
-                      pr.p.svg_piece(&pri)));
-    defs.push(format!(r##"<g id="{}" stroke="black" fill="none">{}</g>"##,
-                      pri.id_select(),
-                      pr.p.svg_select(&pri)));
-    defs.push(pr.p.svg_x_defs(&pri));
+    let mut defs = String::new();
+    write!(defs, r##"<g id="{}">{}</g>"##,
+           pri.id_piece(),
+           pr.p.svg_piece(&pri)).unwrap();
+    write!(defs, r##"<g id="{}" stroke="black" fill="none">{}</g>"##,
+           pri.id_select(),
+           pr.p.svg_select(&pri)).unwrap();
+    write!(defs, "{}", pr.p.svg_x_defs(&pri)).unwrap();
     defs
   }
 
diff --git a/src/imports.rs b/src/imports.rs
index 0d63a6ee..0cade33f 100644
--- a/src/imports.rs
+++ b/src/imports.rs
@@ -1,6 +1,7 @@
 
 pub use std::io;
 pub use std::io::{BufReader,Read,Write};
+pub use std::fmt::Write as _;
 pub use std::fmt::{self,Display,Debug};
 pub use std::thread;
 pub use std::time::Duration;
diff --git a/templates/test.tera b/templates/test.tera
index efede294..e2b8a725 100644
--- a/templates/test.tera
+++ b/templates/test.tera
@@ -18,11 +18,7 @@
       {{piece}}
 {%- endfor %}
 {%- for piece in defs %}
-      <defs id="defs{{ piece.0 }}">
-{%-   for item in piece.1 %}
-        {{item}}
-{%-   endfor %}
-      </defs>
+      <defs id="defs{{ piece.0 }}">{{ piece.1 }}</defs>
 {%- endfor %}
     </svg>