From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 27 Feb 2021 14:04:00 +0000 (+0000)
Subject: hand: Break out gs fields
X-Git-Tag: otter-0.4.0~313
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=1a47d1fc6e86c0049b0aeea164f1f4fd0f044977;p=otter.git

hand: Break out gs fields

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

diff --git a/src/hand.rs b/src/hand.rs
index 7761751f..0a00b9f5 100644
--- a/src/hand.rs
+++ b/src/hand.rs
@@ -132,14 +132,15 @@ impl PieceTrait for Hand {
                   -> PieceUpdateResult {
     let ApiPieceOpArgs { gs, player, piece, ..} = a;
     let gplayers = &mut gs.players;
-    let gpc = gs.pieces.byid_mut(piece)?;
+    let gpieces = &mut gs.pieces;
+    let _goccults = &mut gs.occults;
+    let gpc = gpieces.byid_mut(piece)?;
     let xdata = gpc.xdata.get_mut::<HandState>()
       .map_err(|e| APOE::ReportViaResponse(e.into()))?;
     let old_desc = self.describe_html_inner(Some(xdata));
 
     let dasharray = player_dasharray(gplayers, player);
     let gpl = gplayers.byid_mut(player)?;
-    let _occults = &mut gs.occults;
 
     let did;
     let new_owner;