From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 17 Feb 2021 18:43:49 +0000 (+0000)
Subject: hidden: recalculate: remove who_by from _general
X-Git-Tag: otter-0.4.0~428
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=240f49d0f72a3380ee37ade51a2a82fddc36f89a;p=otter.git

hidden: recalculate: remove who_by from _general

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

diff --git a/src/hidden.rs b/src/hidden.rs
index 2ba2811b..5ce934d8 100644
--- a/src/hidden.rs
+++ b/src/hidden.rs
@@ -217,11 +217,10 @@ fn recalculate_occultation_general<
   RD,                                                 // return data
   LD,                                                 // log data
   VF: FnOnce(LD) -> RD,                               // ret_vanilla
-  LF: FnOnce(&Html, Html, Html, Option<&Html>) -> LD, // log_callback
+  LF: FnOnce(Html, Html, Option<&Html>) -> LD,        // log_callback
   RF: FnOnce(PieceUpdateOps_PerPlayer, LD) -> RD,     // ret_callback
 >(
   gs: &mut GameState,
-  who_by: Html,
   ipieces: &PiecesLoaded,
   piece: PieceId,
   // if no change, we return ret_vanilla(log_visible)
@@ -334,8 +333,7 @@ fn recalculate_occultation_general<
 
     let call_log_callback =
       |show| Ok::<_,IE>(
-        log_callback(&who_by,
-                     describe_occulter(ONI::Old)?,
+        log_callback(describe_occulter(ONI::Old)?,
                      describe_occulter(ONI::New)?,
                      show)
       );
@@ -390,12 +388,11 @@ pub fn recalculate_occultation_piece(
 {
   recalculate_occultation_general(
     gs,
-    who_by,
     ipieces,
     piece,
     vanilla_log,
     |log| (vanilla_wrc, vanilla_op, log).into(),
-    |who_by, old, new, show| vec![ LogEntry { html: Html(format!(
+    |old, new, show| vec![ LogEntry { html: Html(format!(
       "{} moved {} from {} to {}",
       &who_by.0,
       if let Some(show) = show { &show.0 } else { "something" },