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 0ebd10ae78685ad82676f38bfcdaf6b21b37b9ac..73a15c65e82c6aa8fb52f4ef421df205ca1cf368 100644 (file)
--- 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 bc3b42c36d4159382730e26dbfd3c4f9c833c0fa..ec4a6621f358670f6b1902c17278c44588d53cdc 100644 (file)
--- 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 {