From 2dd918d15be6885a44c198ca272b0c411e3d120a Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 29 Apr 2022 23:49:08 +0100 Subject: [PATCH] Use default() for empty UnpreparedUpdates, not None We are going to make this into a vec![]. Doing this change now will reduce the textual impact a lot. Signed-off-by: Ian Jackson --- daemon/api.rs | 4 ++-- daemon/cmdlistener.rs | 28 ++++++++++++++-------------- src/clock.rs | 4 ++-- src/dice.rs | 4 ++-- src/gamestate.rs | 4 ++-- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/daemon/api.rs b/daemon/api.rs index e44bea8e..8828d570 100644 --- a/daemon/api.rs +++ b/daemon/api.rs @@ -65,7 +65,7 @@ mod op { impl Complex for T where T: Core + Simple { #[throws(ApiPieceOpError)] fn op_complex(&self, a: ApiPieceOpArgs) -> OpOutcomeThunk { - (self.op(a)?, None).into() + (self.op(a)?, default()).into() } } } @@ -622,7 +622,7 @@ api_route!{ wrc, PieceUpdateOp::Modify(()), logents, - ).into(), None).into() + ).into(), default()).into() }, _ => break, diff --git a/daemon/cmdlistener.rs b/daemon/cmdlistener.rs index 73a0e766..2ee41962 100644 --- a/daemon/cmdlistener.rs +++ b/daemon/cmdlistener.rs @@ -547,7 +547,7 @@ fn execute_game_insn<'cs, 'igr, 'ig: 'igr>( fn no_updates<'igr,'ig>(ig: &'igr mut InstanceGuard<'ig>, mgr: MgmtGameResponse) -> ExecuteGameInsnResults<'igr, 'ig> { - (U{ pcs: vec![], log: vec![], raw: None }, mgr, None, vec![], ig) + (U{ pcs: vec![], log: vec![], raw: None }, mgr, default(), vec![], ig) } #[throws(MgmtError)] @@ -565,7 +565,7 @@ fn execute_game_insn<'cs, 'igr, 'ig: 'igr>( { let (ig, _) = cs.check_acl(ag, ig, PCH::Instance, p)?; let resp = f(ig)?; - (U{ pcs: vec![], log: vec![], raw: None }, resp, None, vec![], ig) + (U{ pcs: vec![], log: vec![], raw: None }, resp, default(), vec![], ig) } #[throws(MgmtError)] @@ -611,7 +611,7 @@ fn execute_game_insn<'cs, 'igr, 'ig: 'igr>( (U{ log, pcs: vec![], raw: Some(vec![ PreparedUpdateEntry::SetLinks(ig.links.clone()) ])}, - Fine, None, vec![], ig) + Fine, default(), vec![], ig) } #[throws(MgmtError)] @@ -640,7 +640,7 @@ fn execute_game_insn<'cs, 'igr, 'ig: 'igr>( log: vec![ logent ], raw: None }, MGR::InsnExpanded, - None, insns, ig) + default(), insns, ig) } #[throws(MgmtError)] @@ -711,7 +711,7 @@ fn execute_game_insn<'cs, 'igr, 'ig: 'igr>( who, size.x(), size.y()), }], raw: Some(vec![ PreparedUpdateEntry::SetTableSize(size) ]) }, - Fine, None, vec![], ig) + Fine, default(), vec![], ig) } MGI::SetTableColour(colour) => { @@ -724,7 +724,7 @@ fn execute_game_insn<'cs, 'igr, 'ig: 'igr>( &who, &colour), }], raw: Some(vec![ PreparedUpdateEntry::SetTableColour(colour) ]) }, - Fine, None, vec![], ig) + Fine, default(), vec![], ig) } MGI::JoinGame { @@ -760,7 +760,7 @@ fn execute_game_insn<'cs, 'igr, 'ig: 'igr>( log: vec![ logentry ], raw: Some(vec![ update ] )}, MGR::JoinGame { nick, player, token: atr }, - None, vec![], ig) + default(), vec![], ig) }, MGI::DeletePieceAlias(alias) => { @@ -809,7 +809,7 @@ fn execute_game_insn<'cs, 'igr, 'ig: 'igr>( let ig = ig.by_mut(superuser.into()); let (gen, mgr) = some_synch_core(ig)?; let log = LogEntry { html: synch_logentry(gen) }; - (U{ pcs: vec![], log: vec![log], raw: None }, mgr, None, vec![], ig) + (U{ pcs: vec![], log: vec![log], raw: None }, mgr, default(), vec![], ig) }, MGI::PieceIdLookupFwd { player, piece } => { @@ -888,7 +888,7 @@ fn execute_game_insn<'cs, 'igr, 'ig: 'igr>( (U{ log, pcs: vec![], raw: None}, - Fine, None, vec![], ig) + Fine, default(), vec![], ig) }, MGI::Info => readonly(cs,ag,ig, &[TP::ViewNotSecret], |ig|{ @@ -1008,7 +1008,7 @@ fn execute_game_insn<'cs, 'igr, 'ig: 'igr>( (U{ pcs: vec![], log: vec![ LogEntry { html }], raw: Some(vec![ update ]) }, - Fine, None, vec![], ig) + Fine, default(), vec![], ig) }, MGI::DeletePiece(piece) => { @@ -1064,7 +1064,7 @@ fn execute_game_insn<'cs, 'igr, 'ig: 'igr>( prepub.piece_updates(xupdates, &None)) as SomeUnpreparedUpdates ) - } else { None }, + } else { default() }, vec![], ig_g) }, @@ -1151,7 +1151,7 @@ fn execute_game_insn<'cs, 'igr, 'ig: 'igr>( html: hformat!("{} added {} pieces", who, count_len), }], raw: None }, - Fine, None, vec![], ig_g) + Fine, default(), vec![], ig_g) }, MGI::ClearLog => { @@ -1176,7 +1176,7 @@ fn execute_game_insn<'cs, 'igr, 'ig: 'igr>( html: hformat!("{} cleared the log history", who), } ], raw }, - Fine, None, vec![], ig) + Fine, default(), vec![], ig) }, MGI::SetACL { acl } => { @@ -1237,7 +1237,7 @@ fn execute_game_insn<'cs, 'igr, 'ig: 'igr>( (U{ pcs: vec![ ], log, raw: Some(updates) }, - Fine, None, vec![], ig) + Fine, default(), vec![], ig) }, }; Ok(y) diff --git a/src/clock.rs b/src/clock.rs index 256954d9..00f53ae8 100644 --- a/src/clock.rs +++ b/src/clock.rs @@ -695,7 +695,7 @@ impl PieceTrait for Clock { WhatResponseToClientOp::Unpredictable, PieceUpdateOp::Modify(()), log); - (r.into(), None) + (r.into(), default()) } UniversalImage => { let r: UpdateFromOpComplex = ( @@ -719,7 +719,7 @@ impl PieceTrait for Clock { was_held: Option) -> UnpreparedUpdates { let gpc = gpieces.get_mut(piece); - let gpc = if let Some(gpc) = gpc { gpc } else { return None }; + let gpc = if let Some(gpc) = gpc { gpc } else { return default() }; let now_held = gpc.held; let state: &mut State = gpc.xdata_mut_exp()?; let was_current = state.current; diff --git a/src/dice.rs b/src/dice.rs index 09db3320..658e199b 100644 --- a/src/dice.rs +++ b/src/dice.rs @@ -392,7 +392,7 @@ impl PieceTrait for Die { wrc, PieceUpdateOp::Modify(()), logents, - ).into(), None).into() + ).into(), default()).into() }, _ => throw!(Ia::BadUiOperation) @@ -413,7 +413,7 @@ impl PieceTrait for Die { _was_held: Option) -> UnpreparedUpdates { self.cooldown_cleanup_hook(gpieces, piece)?; - None + default() } #[throws(IE)] diff --git a/src/gamestate.rs b/src/gamestate.rs index 59207446..eb0d114d 100644 --- a/src/gamestate.rs +++ b/src/gamestate.rs @@ -223,7 +223,7 @@ pub trait PieceTrait: PieceBaseTrait + Send + Debug + 'static { _gpieces: &mut GPieces, _piece: PieceId, _was_held: Option) - -> Result { Ok(None) } + -> Result { Ok(default()) } fn loaded_hook(&self, _piece: PieceId, _gs: &mut GameState, _ig: &InstanceRef) -> Result<(),IE> { @@ -241,7 +241,7 @@ pub trait PieceTrait: PieceBaseTrait + Send + Debug + 'static { fn sortkey(&self) -> Option<&str> { None } fn occultation_notify_hook(&self, _piece: PieceId) -> UnpreparedUpdates { - None + default() } fn op_multigrab(&self, _a: ApiPieceOpArgs, _pri: PieceRenderInstructions, -- 2.30.2