UnpreparedUpdates: Rename types a bit

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

diff --git a/daemon/cmdlistener.rs b/daemon/cmdlistener.rs
index bb94579e49a63fc135e25ea28e61c866aa420546..67ca6fb56deb220bc529044fcac8941c34ebe370 100644 (file)
--- a/daemon/cmdlistener.rs
+++ b/daemon/cmdlistener.rs
@@ -232,7 +232,7 @@ fn execute(cs: &mut CommandStream, cmd: MgmtCommand) -> MgmtResponse {
 type ExecuteGameInsnResults<'igr, 'ig> = (
   ExecuteGameChangeUpdates,
   MgmtGameResponse,
-  Option<UnpreparedUpdates>, // These happena after everything else
+  UnpreparedUpdates, // These happena after everything else
   &'igr mut InstanceGuard<'ig>,
 );
 
@@ -620,7 +620,7 @@ fn execute_game_insn<'cs, 'igr, 'ig: 'igr>(
        Some(
          Box::new(move |prepub: &mut PrepareUpdatesBuffer|
                   prepub.piece_updates(xupdates))
-           as UnpreparedUpdates
+           as SomeUnpreparedUpdates
        ),
        ig_g)
     },

diff --git a/src/updates.rs b/src/updates.rs
index b9bf85d33440976de74e471a43f036c2d19fc8f1..3266a70f300cfde3eb7abf296601bdae85a3fb04 100644 (file)
--- a/src/updates.rs
+++ b/src/updates.rs
@@ -17,7 +17,8 @@ pub type RawClientSequence = u64;
 #[serde(transparent)]
 pub struct ClientSequence(RawClientSequence);
 
-pub type UnpreparedUpdates = Box<
+pub type UnpreparedUpdates = Option<SomeUnpreparedUpdates>;
+pub type SomeUnpreparedUpdates = Box<
     dyn for<'r> FnOnce(&'r mut PrepareUpdatesBuffer)
     >;