From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 17 Feb 2021 00:29:43 +0000 (+0000)
Subject: hidden: recalculate: rename types and comment
X-Git-Tag: otter-0.4.0~432
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=19ca5c8466a27ee65b9fdc234813e1d111ce0d56;p=otter.git

hidden: recalculate: rename types and comment

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

diff --git a/src/hidden.rs b/src/hidden.rs
index e24bd0ac..b2db9da7 100644
--- a/src/hidden.rs
+++ b/src/hidden.rs
@@ -211,21 +211,22 @@ pub fn massage_prep_piecestate(
 
 #[throws(InternalError)]
 fn recalculate_occultation_general<
-  R, LD,
-  V: FnOnce(LD) -> R,
-  L: FnOnce(&Html, Html, Html, Option<&Html>) -> LD,
-  F: FnOnce(PieceUpdateOps_PerPlayer, LD) -> R,
+  RD,                                                 // return data
+  LD,                                                 // log data
+  VF: FnOnce(LD) -> RD,                               // ret_vanilla
+  LF: FnOnce(&Html, 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,
   log_visible: LD,
-  ret_vanilla: V,
-  log_callback: L,
-  ret_callback: F,
+  ret_vanilla: VF,
+  log_callback: LF,
+  ret_callback: RF,
 )
-  -> R
+  -> RD
 {
   // fallible part
   let (puos, log, occids): (_, _, OldNew<Option<OccId>>) = {