From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 30 Jan 2021 15:03:53 +0000 (+0000)
Subject: hidden prep: Pass PUO to piece_update_fallible
X-Git-Tag: otter-0.4.0~604
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=07dc967f59b3e1bc17e2102eab748aa9c94fe6d5;p=otter.git

hidden prep: Pass PUO to piece_update_fallible

No functional change.

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

diff --git a/src/updates.rs b/src/updates.rs
index fd60c675..3cb6e953 100644
--- a/src/updates.rs
+++ b/src/updates.rs
@@ -426,8 +426,9 @@ impl<'r> PrepareUpdatesBuffer<'r> {
                             lens: &dyn Lens) -> Result<(),OE> {
     let by_client = (WRC::Unpredictable, client, cseq);
     let mut buf = PrepareUpdatesBuffer::new(ig, Some(by_client), None);
+    let ops = PUO::Simple(PieceUpdateOp::Modify(()));
     let state = buf.piece_update_fallible(
-      piece, PieceUpdateOp::Modify(()), lens, |pc, gen, _by_client| {
+      piece, ops, lens, |pc, gen, _by_client| {
         match partially {
           POEPP::Unprocessed => { }
           POEPP::Partially => { pc.gen = gen; pc.lastclient = default(); }
@@ -444,7 +445,7 @@ impl<'r> PrepareUpdatesBuffer<'r> {
 
   #[throws(InternalError)]
   fn piece_update_fallible<GUF>(&mut self, piece: PieceId,
-                                update: PieceUpdateOp<(),()>,
+                                ops: PieceUpdateOps,
                                 lens: &dyn Lens,
                                 gen_update: GUF) -> PreparedUpdateEntry_Piece
     where GUF: FnOnce(&mut PieceState, Generation, &IsResponseToClientOp)
@@ -452,6 +453,8 @@ impl<'r> PrepareUpdatesBuffer<'r> {
     let gen = self.gen();
     let gs = &mut self.g.gs;
 
+    let PUO::Simple(update) = ops;
+
     let (update, piece) = match (
       gs.pieces.byid_mut(piece),
       self.g.ipieces.get(piece),
@@ -492,10 +495,8 @@ impl<'r> PrepareUpdatesBuffer<'r> {
     // Caller needs us to be infallible since it is too late by
     // this point to back out a game state change.
 
-    let PUO::Simple(update) = ops;
-
     let update = self.piece_update_fallible(
-      piece, update, lens,
+      piece, ops, lens,
       |pc, gen, by_client|
     {
       match *by_client {