Refactor: Break out pri.map_piece_update_op

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

diff --git a/src/pcrender.rs b/src/pcrender.rs
index e1f8301d6016ef2cec39bf3b852f27b2a9066810..6cbb015f8889ef04d1824f5cceb7700f73312095 100644 (file)
--- a/src/pcrender.rs
+++ b/src/pcrender.rs
@@ -35,6 +35,23 @@ impl VisiblePieceAngle {
 }
 
 impl PieceRenderInstructions {
+  #[throws(IE)]
+  pub fn map_piece_update_op(&self, ioccults: &IOccults,
+                             gpc: &GPiece, ipc: &IPiece,
+                             op: PieceUpdateOp<(),()>
+  ) -> PieceUpdateOp<PreparedPieceState, ZLevel>
+  {
+    op.try_map(
+      |()|{
+        let ns = self.prep_piecestate(ioccults, gpc, ipc)?;
+        <Result<_,InternalError>>::Ok(ns)
+      },
+      |()|{
+        Ok(gpc.zlevel.clone())
+      }
+    )?
+  }
+  
   #[throws(IE)]
   pub fn prep_piecestate(&self, ioccults: &IOccults,
                          gpc: &GPiece, ipc: &IPiece)

diff --git a/src/updates.rs b/src/updates.rs
index 16233ce9b26b2d23f435ac47a3e9c41d9c69c72b..b6eb9013727fe9a9413f0dbffcbf6b0b86fc9614 100644 (file)
--- a/src/updates.rs
+++ b/src/updates.rs
@@ -506,15 +506,7 @@ impl<'r> PrepareUpdatesBuffer<'r> {
 
     max_z.update_max(&gpc.zlevel.z);
 
-    let op = op.try_map(
-      |()|{
-        let ns = pri.prep_piecestate(ioccults, gpc, ipc)?;
-        <Result<_,InternalError>>::Ok(ns)
-      },
-      |()|{
-        Ok(gpc.zlevel.clone())
-      }
-    )?;
+    let op = pri.map_piece_update_op(ioccults, gpc, ipc, op)?;
 
     Some(PreparedPieceUpdate {
       piece: pri.vpid,