From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 29 Nov 2020 20:59:04 +0000 (+0000)
Subject: make it obvious when new fields are added
X-Git-Tag: otter-0.2.0~301
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=148cbcd4eed86325d1613f557931247c76b627d1;p=otter.git

make it obvious when new fields are added

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

diff --git a/src/bin/otter.rs b/src/bin/otter.rs
index bebb70a9..0448cc73 100644
--- a/src/bin/otter.rs
+++ b/src/bin/otter.rs
@@ -786,7 +786,10 @@ mod reset_game {
       game: ma.instance_name(&args.table_name),
       how: MgmtGameUpdateMode::Bulk,
     };
-    let game: GameSpec = read_spec(&ma, &args.game_file)?;
+    let GameSpec {
+      table_size,
+      pieces,
+    } = read_spec(&ma, &args.game_file)?;
 
     let mut insns = vec![];
 
@@ -810,12 +813,11 @@ mod reset_game {
       insns.push(MgmtGameInstruction::DeletePiece(p.piece));
     }
 
-    if let Some(size) = game.table_size {
-      insns.push(MGI::SetTableSize(size));
+    if let Some(table_size) = table_size {
+      insns.push(MGI::SetTableSize(table_size));
     }
 
-    let mut game = game;
-    for pspec in game.pieces.drain(..) {
+    for pspec in pieces.into_iter() {
       insns.push(MGI::AddPieces(pspec));
     }