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

clippy: Miscellaneous minor changes, and allow lints

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

diff --git a/clippy-options b/clippy-options
index ccf4fce6..e7ab1003 100644
--- a/clippy-options
+++ b/clippy-options
@@ -13,3 +13,6 @@
 -A clippy::comparison_to_empty
 -A clippy::try_err
 -A clippy::unit_arg # does badly with if_chain, at least
+-A clippy::single_match
+-A clippy::too_many_arguments # yes, I know
+-A clippy::never_loop # control flow bodge
diff --git a/src/bundles.rs b/src/bundles.rs
index 5e419e5b..6c96609d 100644
--- a/src/bundles.rs
+++ b/src/bundles.rs
@@ -651,7 +651,7 @@ fn parse_bundle<EH>(id: Id, instance: &InstanceName,
 
   for LibScanned { libname, dir_inzip, inzip } in libs {
     eh.besteffort(|| Ok::<_,LE>({
-      let svg_dir = format!("{}/lib{:06}", id.path_dir(&instance), &inzip);
+      let svg_dir = format!("{}/lib{:06}", id.path_dir(instance), &inzip);
 
       let mut zf = za.i(inzip)?;
       let mut catalogue_data = String::new();
@@ -811,7 +811,7 @@ fn usvg_size(f: &mut BufReader<File>) -> [f64;2] {
         );
 
         if let Ok(output) = size.iter().cloned()
-          .filter_map(|s|s)
+          .flatten()
           .collect::<ArrayVec<_,2>>()
           .into_inner() {
             break output;