chiark / gitweb /
hidden: per-player id map: Fix to not use _ that way
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 12 Feb 2021 00:42:43 +0000 (00:42 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 12 Feb 2021 01:30:07 +0000 (01:30 +0000)
This means "may be unused", not "internal", in Rust.

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

index fda26d1c57e3386c1c667f76cfbe11a90ca358ab..b2288d46f9d42a8f395ac913c46b9eb3bfbb9814 100644 (file)
@@ -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())
   }
 }