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

Switch to deriving Deref

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

diff --git a/wdriver/wdt-hand.rs b/wdriver/wdt-hand.rs
index 0ebd10ae..73a15c65 100644
--- a/wdriver/wdt-hand.rs
+++ b/wdriver/wdt-hand.rs
@@ -4,12 +4,12 @@
 
 use crate::*;
 
+#[derive(Deref)]
 struct Ctx {
-  su: Setup,
+  #[deref] su: Setup,
   alice: Window,
   bob: Window,
 }
-deref_to_field!{Ctx, Setup, su}
 usual_wanted_tests!{Ctx, su}
 
 const HAND: &str = "6v1";
diff --git a/wdriver/wdt-simple.rs b/wdriver/wdt-simple.rs
index bc3b42c3..ec4a6621 100644
--- a/wdriver/wdt-simple.rs
+++ b/wdriver/wdt-simple.rs
@@ -4,13 +4,13 @@
 
 use crate::*;
 
+#[derive(Deref)]
 struct Ctx {
-  su: Setup,
+  #[deref] su: Setup,
   alice: Window,
   bob: Window,
   spec: GameSpec,
 }
-deref_to_field!{Ctx, Setup, su}
 usual_wanted_tests!{Ctx, su}
 
 impl Ctx {