From af4e68df14567245214af2b2013a7a4601a88849 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 21 Feb 2021 16:49:23 +0000 Subject: [PATCH] ListPieces refactor prep for fallible: use filter_map NFC Signed-off-by: Ian Jackson --- daemon/cmdlistener.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/daemon/cmdlistener.rs b/daemon/cmdlistener.rs index ec0c83ce..19af73d5 100644 --- a/daemon/cmdlistener.rs +++ b/daemon/cmdlistener.rs @@ -375,7 +375,7 @@ fn execute_game_insn<'cs, 'igr, 'ig: 'igr>( }, MGI::ListPieces => readonly(cs,ag,ig, &[TP::ViewNotSecret], |ig|{ - let pieces = ig.gs.pieces.iter().map(|(piece,p)|{ + let pieces = ig.gs.pieces.iter().filter_map(|(piece,p)| { let &PieceState { pos, face, .. } = p; let pinfo = ig.ipieces.get(piece)?; let desc_html = pinfo.describe_html_infallible(None, p); @@ -393,7 +393,7 @@ fn execute_game_insn<'cs, 'igr, 'ig: 'igr>( piece, itemname, visible }) - }).flatten().collect(); + }).collect(); Ok(MGR::Pieces(pieces)) })?, -- 2.30.2