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 ccf4fce626ce97f3b1a93d58078c42fe4e32363d..e7ab100399f789c7b7254c1a508530c4b8ecee36 100644 (file)
--- 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 5e419e5baf8c70ac76176ec78e252178dc19517d..6c96609d378d02e295e96afefc34c77702640975 100644 (file)
--- 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;