pos_zlevel: Move clone into callers

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/daemon/session.rs b/daemon/session.rs
index 41ab409bb93a1843873585d53e8248f57a2a0896..ddc6dcfff8fadb566f2b76b20824c7244e89231f 100644 (file)
--- a/daemon/session.rs
+++ b/daemon/session.rs
@@ -129,7 +129,7 @@ fn session_inner(form: Json<SessionForm>,
 
       let for_info = SessionPieceLoadJson {
         held: &gpc.held,
-        z: zlevel.z,
+        z: zlevel.z.clone(),
         zg: zlevel.zg,
         pinned: gpc.pinned,
         angle: vangle,

diff --git a/src/pcrender.rs b/src/pcrender.rs
index 6cbb015f8889ef04d1824f5cceb7700f73312095..d25167fe6b0b5fc6df3b1670849d5bb2f59a6d73 100644 (file)
--- a/src/pcrender.rs
+++ b/src/pcrender.rs
@@ -63,7 +63,7 @@ impl PieceRenderInstructions {
       pos        : pos,
       held       : gpc.held,
       svg        : pri.make_defs(ioccults, gpc, ipc)?,
-      z          : zlevel.z,
+      z          : zlevel.z.clone(),
       zg         : zlevel.zg,
       angle      : pri.angle(gpc).to_compass(),
       pinned     : gpc.pinned,
@@ -103,11 +103,11 @@ impl PieceRenderInstructions {
     }
   }
 
-  pub fn pos_zlevel(&self, gpc: &GPiece) -> (Pos, ZLevel) {
+  pub fn pos_zlevel<'r>(&'r self, gpc: &'r GPiece) -> (Pos, &'r ZLevel) {
     use PriOcculted as PO;
     match &self.occulted {
-      PO::Visible | PO::Occulted => (gpc.pos, gpc.zlevel.clone()),
-      PO::Displaced(pos, zlevel) => (*pos, zlevel.clone()),
+      PO::Visible | PO::Occulted => (gpc.pos, &gpc.zlevel),
+      PO::Displaced(pos, zlevel) => (*pos, &zlevel),
     }
   }