From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 13 Mar 2021 21:42:22 +0000 (+0000)
Subject: rename ToPermute from ToRecompute
X-Git-Tag: otter-0.4.0~88
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=ed0a9f985110ac7c2345471e23eba7a20557b3b0;p=otter.git

rename ToPermute from ToRecompute

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

diff --git a/daemon/api.rs b/daemon/api.rs
index ec1c2d00..5378596c 100644
--- a/daemon/api.rs
+++ b/daemon/api.rs
@@ -105,7 +105,7 @@ fn api_piece_op<O: op::Complex>(form: Json<ApiPiece<O>>)
   let mut ig = iad.gref.lock()?;
   ig.save_game_later();
 
-  ToRecompute::with(move |to_recompute| {
+  ToPermute::with(move |to_recompute| {
     let r = (||{
 
   let g = &mut *ig;
diff --git a/src/hidden.rs b/src/hidden.rs
index 1ac7decf..fb809471 100644
--- a/src/hidden.rs
+++ b/src/hidden.rs
@@ -647,7 +647,7 @@ fn recalculate_occultation_general<
   gpieces: &mut GPieces,
   goccults: &mut GameOccults,
   ipieces: &IPieces,
-  to_recompute: &mut ToRecompute,
+  to_recompute: &mut ToPermute,
   piece: PieceId,
   // if no change, we return ret_vanilla(log_visible)
   log_visible: LD,
@@ -867,7 +867,7 @@ pub fn recalculate_occultation_piece(
 )
   -> PieceUpdate
 {
-  ToRecompute::with(|mut to_recompute| (
+  ToPermute::with(|mut to_recompute| (
     recalculate_occultation_general(
       &mut gs.gen.unique_gen(),
       &gs.players, &mut gs.pieces, &mut gs.occults, ipieces, &mut to_recompute,
@@ -898,7 +898,7 @@ fn recalculate_occultation_ofmany(
   gpieces: &mut GPieces,
   goccults: &mut GameOccults,
   ipieces: &IPieces,
-  to_recompute: &mut ToRecompute,
+  to_recompute: &mut ToPermute,
   ppiece: PieceId,
   updates: &mut Vec<(PieceId, PieceUpdateOps)>,
 ){
@@ -917,15 +917,15 @@ mod recompute {
   use super::*;
 
   #[derive(Debug)]
-  pub struct ToRecompute {
+  pub struct ToPermute {
     outdated: HashSet<OccId>,
   }
   #[derive(Debug)]
   pub struct Implemented { }
 
-  impl ToRecompute {
+  impl ToPermute {
     pub fn with<R, F: FnOnce(Self) -> (R, Implemented)>(f: F) -> R {
-      let to_recompute = ToRecompute { outdated: default() };
+      let to_recompute = ToPermute { outdated: default() };
       let (r, Implemented { }) = f(to_recompute);
       r
     }
@@ -950,7 +950,7 @@ mod recompute {
   }
 }
 
-pub use recompute::ToRecompute;
+pub use recompute::ToPermute;
 
 #[must_use]
 pub struct NascentOccultation(Occultation);
@@ -1033,7 +1033,7 @@ pub fn create_occultation(
   let occid = goccults.occults.insert(occultation);
   let mut updates = vec![];
 
-  ToRecompute::with(|mut to_recompute| (
+  ToPermute::with(|mut to_recompute| (
     (||{
       let ogpc = gpieces.get_mut(occulter).ok_or_else(
         ||internal_logic_error("occulter vanished"))?;
@@ -1100,7 +1100,7 @@ pub fn remove_occultation(
       
   let mut updates = vec![];
 
-  ToRecompute::with(|mut to_recompute| ({
+  ToPermute::with(|mut to_recompute| ({
     let pieces: Vec<PieceId> = if let Some(o) = &occultation {
       o.notches.iter().collect()
     } else {