api: Create and destroy a ToRecompute

Nothing uses this yet.

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

diff --git a/daemon/api.rs b/daemon/api.rs
index bc965464faf99e37102e5afcab0188d8d9cb2150..ec1c2d00c2ab85d6011e1f6ff75bd505f61304fa 100644 (file)
--- a/daemon/api.rs
+++ b/daemon/api.rs
@@ -104,6 +104,10 @@ fn api_piece_op<O: op::Complex>(form: Json<ApiPiece<O>>)
   let client = iad.ident;
   let mut ig = iad.gref.lock()?;
   ig.save_game_later();
+
+  ToRecompute::with(move |to_recompute| {
+    let r = (||{
+
   let g = &mut *ig;
   let cl = &mut g.clients.byid_mut(client)?;
   // ^ can only fail if we raced
@@ -160,14 +164,25 @@ fn api_piece_op<O: op::Complex>(form: Json<ApiPiece<O>>)
       let mut buf = PrepareUpdatesBuffer::new(g,
                                               Some((wrc, client, form.cseq)),
                                               Some(1 + log.len()));
-      
+
       buf.piece_update(piece, ops);
       buf.piece_updates(updates);
       buf.log_updates(log);
 
       debug!("api_piece_op OK: {:?}", &form);
     }
-  }
+  };
+
+      Ok::<(),OE>(())
+    })();
+
+    let g = &mut *ig;
+    let gs = &mut g.gs;
+    (r, to_recompute.implement(&mut gs.players,
+                               &mut gs.pieces,
+                               &mut gs.occults,
+                               &g.ipieces))
+  })?;
   ""
 }
 

diff --git a/src/hidden.rs b/src/hidden.rs
index b985a539286b9fb74f201a626ab3ad1edd572cc3..1ac7decf099384db4fffd3ff20e46ff1b1998a0a 100644 (file)
--- a/src/hidden.rs
+++ b/src/hidden.rs
@@ -950,7 +950,7 @@ mod recompute {
   }
 }
 
-use recompute::*;
+pub use recompute::ToRecompute;
 
 #[must_use]
 pub struct NascentOccultation(Occultation);