From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 31 Mar 2022 19:58:16 +0000 (+0100)
Subject: clippy: Miscellaneous minor changes
X-Git-Tag: otter-1.0.0~23
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=ecb8013c5190cd6b900350bfd28758785f214c4c;p=otter.git

clippy: Miscellaneous minor changes

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

diff --git a/wdriver/wdriver.rs b/wdriver/wdriver.rs
index 15c5c0e8..35c43b0b 100644
--- a/wdriver/wdriver.rs
+++ b/wdriver/wdriver.rs
@@ -4,6 +4,7 @@
 
 #![allow(clippy::or_fun_call)]
 #![allow(clippy::unnecessary_operation)] // trips on #[throws(Explode)]
+#![allow(clippy::no_effect)] // trips on #[throws(Explode)]
 
 pub use otter_api_tests::*;
 pub use otter_api_tests as apitest;
diff --git a/wdriver/wdt-bundles.rs b/wdriver/wdt-bundles.rs
index 8d1b3e20..60937ee5 100644
--- a/wdriver/wdt-bundles.rs
+++ b/wdriver/wdt-bundles.rs
@@ -20,7 +20,7 @@ impl Ctx {
   #[throws(Explode)]
   fn vatikan_with_deck(&mut self) {
     let game_spec = &self.su.ds.subst("@specs@/vatikan.game.toml")?;
-    self.otter(&["reset"],&[&game_spec])?;
+    self.otter(&["reset"],&[game_spec])?;
 
     {
       let mut alice = self.su.w(&self.alice)?;
diff --git a/wdriver/wdt-simple.rs b/wdriver/wdt-simple.rs
index 1dc559d4..bc3b42c3 100644
--- a/wdriver/wdt-simple.rs
+++ b/wdriver/wdt-simple.rs
@@ -214,7 +214,7 @@ impl Ctx {
     }
     impl<'s> Deref for Got<'s> {
       type Target = Side<'s>;
-      fn deref<'t>(&'t self) -> &'t Side<'s> { &self.side }
+      fn deref<'t>(&'t self) -> &'t Side<'s> { self.side }
     }
 
     let check = |su: &mut Setup, before_gen, check_end_pos|{
@@ -226,7 +226,7 @@ impl Ctx {
         let now = p.posg()?;
 
         let log = w.retrieve_log(before_gen)?;
-        let held = w.piece_held(&pc)?;
+        let held = w.piece_held(pc)?;
         let client = w.client()?;
         let yes = held.as_ref() == Some(&client);
 
@@ -235,8 +235,8 @@ impl Ctx {
 
       dbg!(&gots);
 
-      let y = gots.iter().filter(|got|  got.yes).next().expect("y");
-      let n = gots.iter().filter(|got| !got.yes).next().expect("n");
+      let y = gots.iter().find(|got|  got.yes).expect("y");
+      let n = gots.iter().find(|got| !got.yes).expect("n");
 
       if check_end_pos {
         assert_eq!(y.now, y.try_end);
@@ -263,7 +263,7 @@ impl Ctx {
         }
       }
 
-      let mut yw = su.w(&y.window)?;
+      let mut yw = su.w(y.window)?;
       yw.action_chain()
         .move_w(&yw, y.now)?
         .click()