From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 4 May 2022 20:47:18 +0000 (+0100)
Subject: Switch to deriving Deref
X-Git-Tag: otter-1.1.0~288
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=a928d1677287b4d9e1b0c687f9885cec7dab7222;p=otter.git

Switch to deriving Deref

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

diff --git a/src/global.rs b/src/global.rs
index 94b30346..50a14812 100644
--- a/src/global.rs
+++ b/src/global.rs
@@ -103,6 +103,7 @@ pub struct IOccults {
 }
 
 #[derive(Debug,Serialize,Deserialize,Default)]
+#[derive(Deref)] // No DerefMut to make sure we send updates, save, etc.
 #[serde(transparent)]
 pub struct GPieces(pub(in crate::global) ActualGPieces);
 type ActualGPieces = DenseSlotMap<PieceId, GPiece>;
@@ -1519,9 +1520,6 @@ impl IPieces {
 
 // ---------- gamestate pieces table ----------
 
-// No DerefMut to make sure we send updates, save, etc.
-deref_to_field!{GPieces, ActualGPieces, 0}
-
 impl GPieces {
   pub fn get_mut(&mut self, piece: PieceId) -> Option<&mut GPiece> {
     self.0.get_mut(piece)