From 6db4f8bdcef7295e14330ce9ba253639b737518d Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 3 Aug 2020 02:13:51 +0100
Subject: [PATCH] clippy

---
 src/bin/server.rs                | 2 +-
 src/bin/slotmap-slot-idx-test.rs | 4 ++--
 src/cmdlistener.rs               | 5 +++--
 src/slotmap-slot-idx.rs          | 2 ++
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/bin/server.rs b/src/bin/server.rs
index 91b55408..88e7b9cb 100644
--- a/src/bin/server.rs
+++ b/src/bin/server.rs
@@ -19,7 +19,7 @@ fn index() -> Template {
   Template::render("test",&c)
 }
 
-const RESOURCES : &[&'static str] = &["script.js", "style.css"];
+const RESOURCES : &[&str] = &["script.js", "style.css"];
 
 #[derive(Debug)]
 struct CheckedResourceLeaf { pub safe : &'static str }
diff --git a/src/bin/slotmap-slot-idx-test.rs b/src/bin/slotmap-slot-idx-test.rs
index 07558011..522a613a 100644
--- a/src/bin/slotmap-slot-idx-test.rs
+++ b/src/bin/slotmap-slot-idx-test.rs
@@ -11,11 +11,11 @@ const BATCH : usize = 128;
 const ITERS : usize = 10*1024*1024;
 
 fn main () {
-  let mut vol_i_buffer = [ 0x123456789abcdefu64; BATCH ];
+  let vol_i_buffer = [ 0x123456789abcdefu64; BATCH ];
   let mut vol_o_buffer = [ 0xdeadbeef; BATCH ];
 
   for _it in 0..ITERS {
-    let input = unsafe { std::ptr::read_volatile(&mut vol_i_buffer) };
+    let input = unsafe { std::ptr::read_volatile(&vol_i_buffer) };
     let mut output = [ 0u32; BATCH ];
 
     for (&i,o) in input.iter().zip(output.iter_mut()) {
diff --git a/src/cmdlistener.rs b/src/cmdlistener.rs
index 97cca97a..171d7775 100644
--- a/src/cmdlistener.rs
+++ b/src/cmdlistener.rs
@@ -187,7 +187,7 @@ fn do_authorise_scope(cs: &CommandStream, wanted: &ManagementScope)
         })})()?;
 
         let AuthorisedIf{ authorised_for } = in_userlist;
-        let info = xinfo.as_ref().map(|s| s.as_str());
+        let info = xinfo.as_deref();
         let ok = cs.authorised_uid(authorised_for, info)?;
         (ok,
          ManagementScope::Unix { user: pwent.name })
@@ -361,7 +361,7 @@ fn execute_for_game(cs: &CommandStream, ig: &mut InstanceGuard,
   })();
   MgmtResponse::AlterGame {
     results,
-    error: ok.unwrap_or_else(|e| Some(e))
+    error: ok.unwrap_or_else(Some)
   }
 }
 
@@ -382,6 +382,7 @@ fn execute_game_insn(ig: &mut InstanceGuard, update: MgmtGameInstruction)
 
     MgmtGameInstruction::AddPlayer(pl) => {
       let player = ig.player_new(pl)?;
+      #[allow(clippy::useless_format)] // xxx below
       (vec![],
        vec![ LogEntry {
          html: format!("The facilitator added a player xxx"),
diff --git a/src/slotmap-slot-idx.rs b/src/slotmap-slot-idx.rs
index 1d0ad290..05eb2d08 100644
--- a/src/slotmap-slot-idx.rs
+++ b/src/slotmap-slot-idx.rs
@@ -1,3 +1,5 @@
+#![allow(clippy::or_fun_call)]
+
 //! Provides a [`get_idx_key`](trait.KeyDataExt.html#tymethod.get_idx_version) method on
 //! `slotmap::KeyData`.  See [KeyDataExt::get_idx_version].
 
-- 
2.30.2