From 07a610b2b1e864b9757a7cbbc79b5f1214785a1e Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 31 Mar 2022 21:00:21 +0100
Subject: [PATCH] clippy: Miscellaneous minor changes, and allow lints

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 clippy-options        |  1 +
 daemon/cmdlistener.rs | 21 ++++++++++-----------
 daemon/session.rs     |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/clippy-options b/clippy-options
index 086cd8a8..dfac5903 100644
--- a/clippy-options
+++ b/clippy-options
@@ -40,3 +40,4 @@
 -A clippy::match_single_binding
 -A clippy::needless_update
 -A clippy::comparison_chain
+-A clippy::bool_comparison
diff --git a/daemon/cmdlistener.rs b/daemon/cmdlistener.rs
index 63f1494e..600f1043 100644
--- a/daemon/cmdlistener.rs
+++ b/daemon/cmdlistener.rs
@@ -203,7 +203,7 @@ fn execute_and_respond<W>(cs: &mut CommandStreamData, cmd: MgmtCommand,
       let access = cs.accountrecord_from_spec(access)?
         .unwrap_or_else(|| AccessRecord::new_unset());
       let nick = nick.unwrap_or_else(|| account.to_string());
-      let account = account.to_owned().into();
+      let account = account.into();
       let layout = layout.unwrap_or_default();
       let record = AccountRecord {
         account, nick, access,
@@ -353,7 +353,7 @@ fn execute_and_respond<W>(cs: &mut CommandStreamData, cmd: MgmtCommand,
       access_bundles(
         cs,&ag,&gref,TP_ACCESS_BUNDLES,
         &mut |ig,_|{
-          let f = id.open(&ig)?.ok_or_else(|| ME::BundleNotFound)?;
+          let f = id.open(ig)?.ok_or_else(|| ME::BundleNotFound)?;
           bulk_download = Some(Box::new(f));
           Ok(())
         })?;
@@ -468,7 +468,7 @@ fn execute_and_respond<W>(cs: &mut CommandStreamData, cmd: MgmtCommand,
       MR::SshKeyAdded { index, id }
     }
     MC::SshDeleteKey { index, id } => {
-      let (mut ag, acctid, auth) = start_access_ssh_keys(&cs)?;
+      let (mut ag, acctid, auth) = start_access_ssh_keys(cs)?;
       ag.sshkeys_remove(acctid, index, id, auth)?;
       MR::Fine
     }
@@ -762,7 +762,7 @@ fn execute_game_insn<'cs, 'igr, 'ig: 'igr>(
       no_updates(ig, MGR::Fine)
     },
     MGI::DefinePieceAlias { alias, target } => {
-      let ig = cs.check_acl(&ag, ig, PCH::Instance, &[TP::ChangePieces])?.0;
+      let ig = cs.check_acl(ag, ig, PCH::Instance, &[TP::ChangePieces])?.0;
       ig.pcaliases.insert(alias, target);
       no_updates(ig, MGR::Fine)
     },
@@ -786,7 +786,7 @@ fn execute_game_insn<'cs, 'igr, 'ig: 'igr>(
     }
 
     MGI::InsnMark(token) => {
-      let (ig, _) = cs.check_acl(&ag,ig,PCH::Instance, &[TP::TestExistence])?;
+      let (ig, _) = cs.check_acl(ag,ig,PCH::Instance, &[TP::TestExistence])?;
       no_updates(ig, MGR::InsnMark(token))
     }
 
@@ -1111,7 +1111,7 @@ fn execute_game_insn<'cs, 'igr, 'ig: 'igr>(
           rotateable: true,
         };
         let PieceSpecLoaded { p, loaded_via_alias, occultable } =
-          info.load(piece_i as usize, &mut gpc, &ig, SpecDepth::zero())?;
+          info.load(piece_i as usize, &mut gpc, ig, SpecDepth::zero())?;
         if p.nfaces() <= face.into() {
           throw!(SpecError::FaceNotFound);
         }
@@ -1219,7 +1219,7 @@ fn execute_game_insn<'cs, 'igr, 'ig: 'igr>(
         updates
       }
 
-      let updates = remove_old_players(&ag, ig, who, &mut log)?;
+      let updates = remove_old_players(ag, ig, who, &mut log)?;
 
       (U{ pcs: vec![ ],
           log,
@@ -1248,8 +1248,7 @@ fn execute_for_game<'cs, 'igr, 'ig: 'igr>(
     let ig = igu.by_ref(Authorisation::promise_any());
     if let Ok((_, acctid)) = ag.lookup(account);
     if let Some((player,_)) = ig.iplayers.iter()
-      .filter(|(_,ipr)| ipr.ipl.acctid == acctid)
-      .next();
+      .find(|(_,ipr)| ipr.ipl.acctid == acctid);
     if let Some(gpl) = ig.gs.players.get(player);
     then { hformat!("{} [{}]",
                         gpl.nick,
@@ -1275,7 +1274,7 @@ fn execute_for_game<'cs, 'igr, 'ig: 'igr>(
         &mut self.uh,
         UpdateHandler::from_how(how),
       )
-        .complete(ig, &who)?;
+        .complete(ig, who)?;
     }
     #[throws(ME)]
     fn flushu<'igr, 'ig>(&mut self,
@@ -1852,7 +1851,7 @@ fn do_authorise_scope(cs: &CommandStreamData, ag: &AccountsGuard,
           Authorisation::promise_for(&InUserList),
         );
 
-        let pwent = Passwd::from_name(&wanted)
+        let pwent = Passwd::from_name(wanted)
           .map_err(
             |e| anyhow!("looking up requested username {:?}: {:?}",
                         &wanted, &e)
diff --git a/daemon/session.rs b/daemon/session.rs
index cc145950..9587b579 100644
--- a/daemon/session.rs
+++ b/daemon/session.rs
@@ -143,7 +143,7 @@ fn session_inner(form: Json<SessionForm>,
 
       let (defs, bbox) = pri.make_defs(ioccults, &ig.gs, gpc, ipc)?;
       alldefs.push((pri.vpid, defs));
-      let desc = pri.describe(ioccults,&ig.gs.occults, &gpc, ipc);
+      let desc = pri.describe(ioccults,&ig.gs.occults, gpc, ipc);
 
       let vangle = pri.angle(gpc).to_compass();
       let (pos, zlevel) = pri.pos_zlevel(gpc);
-- 
2.30.2