From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 21 Feb 2021 16:49:23 +0000 (+0000)
Subject: ListPieces refactor prep for fallible: use filter_map
X-Git-Tag: otter-0.4.0~402
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=af4e68df14567245214af2b2013a7a4601a88849;p=otter.git

ListPieces refactor prep for fallible: use filter_map

NFC

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

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))
     })?,