From 71c6a33939792bcafb3a2747d5efce42b41bfe39 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 12 Feb 2021 00:42:43 +0000 Subject: [PATCH] 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 --- src/hidden.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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(&mut self, piece: PieceId, vf: VF, of: OF) -> R + fn fwd_or_insert_internal + (&mut self, piece: PieceId, vf: VF, of: OF) -> R where VF: FnOnce(VisiblePieceId) -> R, OF: FnOnce(secondary::OccupiedEntry) -> 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()) } } -- 2.30.2