UnpreparedUpdates: Move and rename (nfc)

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

diff --git a/daemon/cmdlistener.rs b/daemon/cmdlistener.rs
index 5a51b7be753eb517b1cf49969e3a31f19d5bf237..d2daf79b8d8150dba8bd18b5c5c851bb77017e6f 100644 (file)
--- a/daemon/cmdlistener.rs
+++ b/daemon/cmdlistener.rs
@@ -227,14 +227,12 @@ fn execute(cs: &mut CommandStream, cmd: MgmtCommand) -> MgmtResponse {
 
 // ---------- game command implementations ----------
 
-type ExecuteGameInsnResultsPrepub = Box<
-    dyn for<'r> FnOnce(&'r mut PrepareUpdatesBuffer)
-    >;
+
 
 type ExecuteGameInsnResults<'igr, 'ig> = (
   ExecuteGameChangeUpdates,
   MgmtGameResponse,
-  Option<ExecuteGameInsnResultsPrepub>, // These happena after everything else
+  Option<UnpreparedUpdates>, // These happena after everything else
   &'igr mut InstanceGuard<'ig>,
 );
 
@@ -622,7 +620,7 @@ fn execute_game_insn<'cs, 'igr, 'ig: 'igr>(
        Some(
          Box::new(move |prepub: &mut PrepareUpdatesBuffer|
                   prepub.piece_updates(xupdates))
-           as ExecuteGameInsnResultsPrepub
+           as UnpreparedUpdates
        ),
        ig_g)
     },

diff --git a/src/updates.rs b/src/updates.rs
index 33bf464519d19008ebb1b27e0c13d68ae86a8a28..b9bf85d33440976de74e471a43f036c2d19fc8f1 100644 (file)
--- a/src/updates.rs
+++ b/src/updates.rs
@@ -17,6 +17,10 @@ pub type RawClientSequence = u64;
 #[serde(transparent)]
 pub struct ClientSequence(RawClientSequence);
 
+pub type UnpreparedUpdates = Box<
+    dyn for<'r> FnOnce(&'r mut PrepareUpdatesBuffer)
+    >;
+
 // ---------- from manamgenet operations ----------
 
 #[derive(Debug)] // not Default