From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 12 Feb 2021 00:42:43 +0000 (+0000)
Subject: hidden: per-player id map: Fix to not use _ that way
X-Git-Tag: otter-0.4.0~554
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=71c6a33939792bcafb3a2747d5efce42b41bfe39;p=otter.git

hidden: per-player id map: Fix to not use _ that way

This means "may be unused", not "internal", in Rust.

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

diff --git a/src/hidden.rs b/src/hidden.rs
index fda26d1c..b2288d46 100644
--- a/src/hidden.rs
+++ b/src/hidden.rs
@@ -34,7 +34,8 @@ impl PerPlayerIdMap {
     Some(*self.r.get(vis)?)
   }
 
-  fn _fwd_or_insert<R, VF, OF>(&mut self, piece: PieceId, vf: VF, of: OF) -> R
+  fn fwd_or_insert_internal<R, VF, OF>
+    (&mut self, piece: PieceId, vf: VF, of: OF) -> R
   where VF: FnOnce(VisiblePieceId) -> R,
         OF: FnOnce(secondary::OccupiedEntry<PieceId,VisiblePieceId>) -> R,
   {
@@ -54,13 +55,13 @@ impl PerPlayerIdMap {
   }
 
   pub fn insert(&mut self, piece: PieceId) {
-    self._fwd_or_insert(piece, |_vis|(), |vis|{
+    self.fwd_or_insert_internal(piece, |_vis|(), |vis|{
       panic!("duplicate insert of {:?} {:?}", piece, vis)
     })
   }
 
   pub fn fwd_or_insert(&mut self, piece: PieceId) -> VisiblePieceId {
-    self._fwd_or_insert(piece, |vis|vis, |occ| *occ.get())
+    self.fwd_or_insert_internal(piece, |vis|vis, |occ| *occ.get())
   }
 }