Have OpOutcomeThunk::Deferrecd take &mut InstanceGuard

That way it can call modify_pieces_not_necessarily_saving_aux, which
the fastsplit_split implementaion wants.

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

diff --git a/daemon/api.rs b/daemon/api.rs
index 4a59b5b68fd4ce1e44a903c2ed21323f47e759f3..b9d5636a33d7d459ee4889cb897c73c3ee18f11a 100644 (file)
--- a/daemon/api.rs
+++ b/daemon/api.rs
@@ -145,7 +145,7 @@ fn api_piece_op<O: op::Complex>(form: Json<ApiPiece<O>>)
   })().and_then(|(thunk, loose_conflict)| Ok((
     match thunk {
       OpOutcomeThunk::Immediate(r) => r,
-      OpOutcomeThunk::Reborrow(f) => f(g, player, piece)?,
+      OpOutcomeThunk::Reborrow(f) => f(&mut ig, player, piece)?,
     }, loose_conflict
   ))) {
     Err(APOE::Inapplicable(poe)) => {
@@ -173,7 +173,7 @@ fn api_piece_op<O: op::Complex>(form: Json<ApiPiece<O>>)
         } else {
           Some((wrc, client, form.cseq))
         };
-      let mut buf = PrepareUpdatesBuffer::new(g,
+      let mut buf = PrepareUpdatesBuffer::new(&mut ig,
                                               Some(1 + log.len()));
 
       buf.piece_update(piece, &by_client, ops);

diff --git a/src/updates.rs b/src/updates.rs
index 6e7acd3d18aa723d57e44b4bf8dfd0be27493724..db2780af2953f59eabaab423976663df969eb8c7 100644 (file)
--- a/src/updates.rs
+++ b/src/updates.rs
@@ -196,7 +196,7 @@ pub enum OpOutcomeThunk {
   /// TODO: Provide cooked methods for this (taking `ModifyingPieces`)
   ///
   /// TODO: Provide a `ModifyingPieces` to the closure.
-  Reborrow(Box<dyn FnOnce(&mut Instance, PlayerId, PieceId)
+  Reborrow(Box<dyn FnOnce(&mut InstanceGuard, PlayerId, PieceId)
                    -> Result<UpdateFromOpComplex, ApiPieceOpError>>),
 }