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

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 apitest/apitest.rs  | 12 ++++++------
 clippy-options      |  2 ++
 daemon/main.rs      | 10 +++++-----
 daemon/session.rs   |  2 +-
 src/bin/otterlib.rs |  2 +-
 5 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/apitest/apitest.rs b/apitest/apitest.rs
index eb557519..5eec89ed 100644
--- a/apitest/apitest.rs
+++ b/apitest/apitest.rs
@@ -484,14 +484,14 @@ pub fn reinvoke_via_bwrap(_opts: &Opts, current_exe: &str,
     .args("--unshare-net \
            --dev-bind / / \
            --tmpfs /tmp \
-           --die-with-parent".split(" "))
+           --die-with-parent".split(' '))
     .arg(current_exe);
 
   let (early, late) = {
     let mut still_early = true;
     env::args_os().skip(1)
       .partition::<Vec<_>,_>(|s| {
-        still_early &= early(&s);
+        still_early &= early(s);
         still_early
       })
   };
@@ -590,7 +590,7 @@ pub fn prepare_tmpdir<'x>(opts: &'x Opts, mut current_exe: &'x str) -> DirSubst
 
   let manifest_var = "CARGO_MANIFEST_DIR";
   let src: String = (|| Ok::<_,AE>(match env::var(manifest_var) {
-    Ok(dir) => dir.into(),
+    Ok(dir) => dir,
     Err(env::VarError::NotPresent) => start_dir.clone(),
     e@ Err(_) => throw!(e.context(manifest_var).err().unwrap()),
   }))()
@@ -786,7 +786,7 @@ impl DirSubst {
     let exe = ds.subst("@target@/debug/otter")?;
     let specs = self.subst("@src@/specs")?;
     let mut args: Vec<String> = vec![];
-    args.push("--config"  .to_owned()); args.push(prctx.resolve(&CONFIG));
+    args.push("--config"  .to_owned()); args.push(prctx.resolve(CONFIG));
     args.push("--spec-dir".to_owned()); args.push(prctx.resolve(&specs) );
     args.extend(xargs.to_args(ds));
     let dbg = format!("running {} {:?}", &exe, &args);
@@ -1033,7 +1033,7 @@ pub fn setup_core<O>(module_paths: &[&str]) ->
 
   if !opts.no_bwrap {
     reinvoke_via_bwrap(
-      &opts, &current_exe,
+      opts, &current_exe,
       &mut |s: &OsStr| s.to_str().unwrap().starts_with("--test=")
     )
       .context("reinvoke via bwrap")?;
@@ -1043,7 +1043,7 @@ pub fn setup_core<O>(module_paths: &[&str]) ->
   sleep(opts.pause.into());
 
   let cln = cleanup_notify::Handle::new()?;
-  let ds = prepare_tmpdir(&opts, &current_exe)?;
+  let ds = prepare_tmpdir(opts, &current_exe)?;
 
   let (mgmt_conn, server_child) =
     prepare_gameserver(&cln, &ds).did("setup game server")?;
diff --git a/clippy-options b/clippy-options
index 83346a95..cdc6fc00 100644
--- a/clippy-options
+++ b/clippy-options
@@ -34,3 +34,5 @@
 -A clippy::manual_split_once
 -A clippy::expect_fun_call
 -A clippy::manual_map
+-A clippy::vec_init_then_push
+-A clippy::collapsible_if
diff --git a/daemon/main.rs b/daemon/main.rs
index fbc40c1d..3e7b36ba 100644
--- a/daemon/main.rs
+++ b/daemon/main.rs
@@ -39,9 +39,9 @@ use otter::prelude::*;
 const CT_JAVASCRIPT: mime::Mime = mime::APPLICATION_JAVASCRIPT_UTF_8;
 const CT_TEXT:      mime::Mime = mime::TEXT_PLAIN_UTF_8;
 const CT_HTML:      mime::Mime = mime::TEXT_HTML_UTF_8;
-const CT_ZIP: &'static str = "application/zip";
-const CT_GZIP: &'static str = "application/gzip";
-const CT_WASM: &'static str = "application/wasm";
+const CT_ZIP: &str = "application/zip";
+const CT_GZIP: &str = "application/gzip";
+const CT_WASM: &str = "application/wasm";
 
 trait IntoMime: Debug {
   fn into_mime(&self) -> mime::Mime;
@@ -104,7 +104,7 @@ impl Templates {
 enum ResourceLocation { Main, Wasm(&'static str), }
 type RL = ResourceLocation;
 
-const RESOURCES: &[(&'static str, ResourceLocation, ConstContentType)] = &[
+const RESOURCES: &[(&str, ResourceLocation, ConstContentType)] = &[
   ("script.js",    RL::Main,                       &CT_JAVASCRIPT),
   ("LICENCE",      RL::Main,                       &CT_TEXT),
   ("libre",        RL::Main,                       &CT_HTML),
@@ -381,7 +381,7 @@ async fn r_bundle(path: Path<(
     .set_content_type(ctype.into_mime())
 }
 
-const FILES_PATH: &'static str = "/_/src";
+const FILES_PATH: &str = "/_/src";
 
 #[derive(Error)]
 #[error("actix Files produced improper response: {0}")]
diff --git a/daemon/session.rs b/daemon/session.rs
index b34b83e4..cc145950 100644
--- a/daemon/session.rs
+++ b/daemon/session.rs
@@ -166,9 +166,9 @@ fn session_inner(form: Json<SessionForm>,
       };
 
       let for_piece = SessionPieceContext {
+        pos,
         z: zlevel.clone(),
         id: pri.vpid,
-        pos: pos,
         info: serde_json::to_string(&for_info)
           .map_err(|e| InternalError::JSONEncode(e))?,
       };
diff --git a/src/bin/otterlib.rs b/src/bin/otterlib.rs
index dac2a454..5d2da22f 100644
--- a/src/bin/otterlib.rs
+++ b/src/bin/otterlib.rs
@@ -230,7 +230,7 @@ fn main() {
 
   for libs in opts.libs.split(SPLIT) {
     let tlibs = Config1::PathGlob(libs.to_owned());
-    load_global_libs(&vec![tlibs.clone()])?;
+    load_global_libs(&[tlibs.clone()])?;
   }
   let mut items: Vec<ItemForOutput> = default();
   let ig_dummy = Instance::dummy();
-- 
2.30.2