deck count: Rename ToPermute

We are going to use this to plant our hook

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

diff --git a/daemon/api.rs b/daemon/api.rs
index 9f8ffb6287e4e762622e4ea6b5c30ea144c1453e..ff5ac09f2da2223df1d5410ebf6b1101a4f22112 100644 (file)
--- a/daemon/api.rs
+++ b/daemon/api.rs
@@ -106,7 +106,7 @@ fn api_piece_op<O: op::Complex>(form: Json<ApiPiece<O>>)
   let mut ig = iad.gref.lock()?;
   ig.save_game_later();
 
-  ToPermute::with(|mut to_permute| {
+  ToRecalculate::with(|mut to_recalculate| {
     let r = (||{
 
   let g = &mut *ig;
@@ -142,7 +142,7 @@ fn api_piece_op<O: op::Complex>(form: Json<ApiPiece<O>>)
       form.op.op_complex(ApiPieceOpArgs {
         ioccults, gs, player, piece, ipieces, ipc,
         ig: &iad.gref,
-        to_permute: &mut to_permute,
+        to_recalculate: &mut to_recalculate,
       })?;
     Ok::<_,ApiPieceOpError>(update)
   })() {
@@ -204,7 +204,7 @@ fn api_piece_op<O: op::Complex>(form: Json<ApiPiece<O>>)
     let g = &mut *ig;
     let gs = &mut g.gs;
 
-    (r, to_permute.implement(&mut gs.players,
+    (r, to_recalculate.implement(&mut gs.players,
                              &mut gs.pieces,
                              &mut gs.occults,
                              &g.ipieces))
@@ -339,7 +339,7 @@ api_route!{
   #[throws(ApiPieceOpError)]
   fn op(&self, a: ApiPieceOpArgs) -> PieceUpdate {
     let ApiPieceOpArgs {
-      gs,ioccults,player,piece,ipc,ipieces,to_permute, ..
+      gs,ioccults,player,piece,ipc,ipieces,to_recalculate, ..
     } = a;
     let gpl = gs.players.byid_mut(player).unwrap();
     let gpc = gs.pieces.byid_mut(piece).unwrap();
@@ -362,7 +362,7 @@ api_route!{
       // if piece is occulted, definitely repermute its occultation
       // so that we don't leak which piece is which over repeated
       // adjustment clicks
-      to_permute.mark_dirty(occid);
+      to_recalculate.mark_dirty(occid);
     };
 
     let update=
@@ -371,7 +371,7 @@ api_route!{
         who_by,
         ipieces,
         ioccults,
-        to_permute,
+        to_recalculate,
         piece,
         vanilla,
       ).map_err(|e| OnlineError::from(e))?;

diff --git a/daemon/cmdlistener.rs b/daemon/cmdlistener.rs
index f5ee6e37d9c21f9c5eb401e6127316d88bce9c1b..90e7b096e912b8bfd6259305ae56d4b749bf2382 100644 (file)
--- a/daemon/cmdlistener.rs
+++ b/daemon/cmdlistener.rs
@@ -243,7 +243,7 @@ fn execute_game_insn<'cs, 'igr, 'ig: 'igr>(
   ig: &'igr mut Unauthorised<InstanceGuard<'ig>, InstanceName>,
   update: MgmtGameInstruction,
   who: &Html,
-  to_permute: &mut ToPermute,
+  to_permute: &mut ToRecalculate,
 )
   -> Result<ExecuteGameInsnResults<'igr, 'ig> ,ME>
 {
@@ -797,7 +797,7 @@ fn execute_for_game<'cs, 'igr, 'ig: 'igr>(
   mut insns: Vec<MgmtGameInstruction>,
   how: MgmtGameUpdateMode) -> MgmtResponse
 {
-  ToPermute::with(|mut to_permute| {
+  ToRecalculate::with(|mut to_permute| {
     let r = (||{
 
   let mut uh = UpdateHandler::from_how(how);

diff --git a/src/deck.rs b/src/deck.rs
index 9f1fc2d6c8bc0dd9b27f9b314519e47690284340..eddaaa62808b24a827994170b08584112bb85a59 100644 (file)
--- a/src/deck.rs
+++ b/src/deck.rs
@@ -159,7 +159,7 @@ impl PieceTrait for Deck {
   fn ui_operation(&self, a: ApiPieceOpArgs<'_>,
                   opname: &str, wrc: WhatResponseToClientOp)
                   -> UpdateFromOpComplex {
-    let ApiPieceOpArgs { gs,player,piece,ipieces,ioccults,to_permute,.. } = a;
+    let ApiPieceOpArgs { gs,player,piece,ipieces,ioccults,to_recalculate,.. } = a;
     let gen = &mut gs.gen;
     let gplayers = &mut gs.players;
     let gpieces = &mut gs.pieces;
@@ -206,7 +206,7 @@ impl PieceTrait for Deck {
       xupdates.extend(
         remove_occultation(&mut gen.unique_gen(),
                            gplayers, gpieces, goccults, ipieces, ioccults,
-                           to_permute, piece)
+                           to_recalculate, piece)
           .map_err(|ie| ApiPieceOpError::ReportViaResponse(ie.into()))?
       );
     }
@@ -216,7 +216,7 @@ impl PieceTrait for Deck {
       xupdates.extend(
         create_occultation(&mut gen.unique_gen(), &mut gs.max_z,
                            gplayers, gpieces, goccults, ipieces, ioccults,
-                           to_permute,
+                           to_recalculate,
                            region, piece, views)?
       );
       dbgc!("creating occ done", &xupdates);

diff --git a/src/gamestate.rs b/src/gamestate.rs
index 93a7f822521e59dd4b0ef3a09aba70dc6bd54e24..73ffb5b38baf3a9b038d9df367a34c7857c9082a 100644 (file)
--- a/src/gamestate.rs
+++ b/src/gamestate.rs
@@ -181,7 +181,7 @@ pub struct ApiPieceOpArgs<'a> {
   pub gs: &'a mut GameState,
   pub ipieces: &'a IPieces,
   pub ioccults: &'a IOccults,
-  pub to_permute: &'a mut ToPermute,
+  pub to_recalculate: &'a mut ToRecalculate,
   pub player: PlayerId,
   pub piece: PieceId,
   pub ipc: &'a IPiece,

diff --git a/src/hand.rs b/src/hand.rs
index ef188fed66b56c22594df686b987ddc6054ad57c..5db54ad38fa22cfede72a971d512dab8737147eb 100644 (file)
--- a/src/hand.rs
+++ b/src/hand.rs
@@ -156,7 +156,7 @@ impl PieceTrait for Hand {
   fn ui_operation(&self, a: ApiPieceOpArgs<'_>,
                   opname: &str, wrc: WhatResponseToClientOp)
                   -> UpdateFromOpComplex {
-    let ApiPieceOpArgs { gs,player,piece,ipieces,ioccults,to_permute,.. } = a;
+    let ApiPieceOpArgs { gs,player,piece,ipieces,ioccults,to_recalculate,.. } = a;
     let gen = &mut gs.gen;
     let gplayers = &mut gs.players;
     let gpieces = &mut gs.pieces;
@@ -203,7 +203,7 @@ impl PieceTrait for Hand {
         let xupdates =
           create_occultation(&mut gen.unique_gen(), &mut gs.max_z,
                              gplayers, gpieces, goccults, ipieces, ioccults,
-                             to_permute,
+                             to_recalculate,
                              region, piece, views)?;
 
         dbgc!("creating occ done", &new_owner, &xupdates);
@@ -213,7 +213,7 @@ impl PieceTrait for Hand {
         let xupdates =
           remove_occultation(&mut gen.unique_gen(),
                              gplayers, gpieces, goccults, ipieces, ioccults,
-                             to_permute, piece)
+                             to_recalculate, piece)
           .map_err(|ie| ApiPieceOpError::ReportViaResponse(ie.into()))?;
 
         (None, xupdates, format!("deactivated {}", &old_desc.0))

diff --git a/src/hidden.rs b/src/hidden.rs
index b58d1bc9523bc9b8de508e83e37dc4e9341fba12..0287af9a578faa58b5e58c1e240d72c496b72dbb 100644 (file)
--- a/src/hidden.rs
+++ b/src/hidden.rs
@@ -411,7 +411,7 @@ fn recalculate_occultation_general<
   gplayers: &GPlayers, gpieces: &mut GPieces,
   goccults: &mut GameOccults, ipieces: &IPieces, ioccults: &IOccults,
   //
-  to_permute: &mut ToPermute, piece: PieceId,
+  to_recalculate: &mut ToRecalculate, piece: PieceId,
   // if no change, we return ret_vanilla()
   ret_vanilla: VF,
   // otherwise we use log_invisible or log_callback(who_by,old,new,desc)
@@ -599,7 +599,7 @@ fn recalculate_occultation_general<
       = &mut |goccults, occid|
       // rust-lang/rust/issues/58525
     {
-      to_permute.mark_dirty(occid);
+      to_recalculate.mark_dirty(occid);
       goccults.occults.get_mut(occid).unwrap()
     };
     if let Some((occid, old_notch)) = occulteds.old {
@@ -638,7 +638,7 @@ pub fn recalculate_occultation_piece(
   who_by: Html,
   ipieces: &IPieces,
   ioccults: &IOccults,
-  to_permute: &mut ToPermute,
+  to_recalculate: &mut ToRecalculate,
   piece: PieceId,
   (vanilla_wrc, vanilla_op, vanilla_log): PUFOS,
 )
@@ -647,7 +647,7 @@ pub fn recalculate_occultation_piece(
     recalculate_occultation_general(
       &mut gs.gen.unique_gen(),
       &gs.players, &mut gs.pieces, &mut gs.occults, ipieces, ioccults,
-      to_permute, piece,
+      to_recalculate, piece,
       || (vanilla_wrc, vanilla_op, vanilla_log).into(),
       vec![],
       |old, new, Html(show)| vec![ LogEntry { html: Html(format!(
@@ -677,14 +677,14 @@ fn recalculate_occultation_ofmany(
   goccults: &mut GameOccults,
   ipieces: &IPieces,
   ioccults: &IOccults,
-  to_permute: &mut ToPermute,
+  to_recalculate: &mut ToRecalculate,
   ppiece: PieceId,
   updates: &mut Vec<(PieceId, PieceUpdateOps)>,
 ){
   recalculate_occultation_general(
     gen,
     gplayers, gpieces, goccults, ipieces, ioccults,
-    to_permute, ppiece,
+    to_recalculate, ppiece,
     ||(),
     (), |_,_,_|(),
     |puo_pp, ()|{
@@ -698,16 +698,16 @@ mod recompute {
   use super::*;
 
   #[derive(Debug)]
-  pub struct ToPermute {
+  pub struct ToRecalculate {
     outdated: HashSet<OccId>,
   }
   #[derive(Debug)]
   pub struct Implemented(());
 
-  impl ToPermute {
+  impl ToRecalculate {
     pub fn with<R, F: FnOnce(Self) -> (R, Implemented)>(f: F) -> R {
-      let to_permute = ToPermute { outdated: default() };
-      let (r, Implemented(())) = f(to_permute);
+      let to_recalculate = ToRecalculate { outdated: default() };
+      let (r, Implemented(())) = f(to_recalculate);
       r
     }
     pub fn mark_dirty(&mut self, occid: OccId) { self.outdated.insert(occid); }
@@ -729,7 +729,7 @@ mod recompute {
   }
 }
 
-pub use recompute::ToPermute;
+pub use recompute::ToRecalculate;
 
 #[must_use]
 pub struct NascentOccultation(Occultation);
@@ -775,7 +775,7 @@ pub fn create_occultation(
   goccults: &mut GameOccults,
   ipieces: &IPieces,
   ioccults: &IOccults,
-  to_permute: &mut ToPermute,
+  to_recalculate: &mut ToRecalculate,
   region: Area,
   occulter: PieceId,
   views: OccultationViews,
@@ -846,7 +846,7 @@ pub fn create_occultation(
         recalculate_occultation_ofmany(gen,
                                        gplayers, gpieces, goccults,
                                        ipieces, ioccults,
-                                       to_permute,
+                                       to_recalculate,
                                        ppiece, &mut updates)?;
       }
 
@@ -875,7 +875,7 @@ pub fn remove_occultation(
   goccults: &mut GameOccults,
   ipieces: &IPieces,
   ioccults: &IOccults,
-  to_permute: &mut ToPermute,
+  to_recalculate: &mut ToRecalculate,
   occulter: PieceId,
 ) -> Vec<(PieceId, PieceUpdateOps)> {
   let mut aggerr = AggregatedIE::new();
@@ -913,7 +913,7 @@ pub fn remove_occultation(
       recalculate_occultation_ofmany(gen,
                                      gplayers, gpieces, goccults,
                                      ipieces, ioccults,
-                                     to_permute,
+                                     to_recalculate,
                                      ppiece, &mut updates)
         .unwrap_or_else(|e| {
           aggerr.record(e);