hidden prep: api_wrest: Move was formatting earlier

We want to drop the borrow on gs.players.get(was) because we will want
a mut borrow of gs.players soon.

NFC

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

diff --git a/daemon/api.rs b/daemon/api.rs
index 4a3291f3218ead812f1ad0dfce0a50418c2af8d4..08dd25ce0bfa241ef66778c0f94c4e56d22f5ec8 100644 (file)
--- a/daemon/api.rs
+++ b/daemon/api.rs
@@ -256,14 +256,14 @@ api_route!{
     let was = pc.held;
     pc.held = Some(player);
     let was = was.and_then(|p| gs.players.get(p));    
+    let was = was.map(|was| htmlescape::encode_minimal(&was.nick));
 
     let update = PieceUpdateOp::Modify(());
 
     let pls = &htmlescape::encode_minimal(&gpl.nick);
 
     let logent = LogEntry { html : Html(match was {
-        Some(was) => format!("{} wrested {} from {}", pls, pcs,
-                             &htmlescape::encode_minimal(&was.nick)),
+        Some(was) => format!("{} wrested {} from {}", pls, pcs, was),
         None => format!("{} wrested {}", pls, pcs),
     })};