Miscellaneous cleanups prompted by clippy

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

diff --git a/base/geometry.rs b/base/geometry.rs
index 2228eadc2254be7fe81eab87e47d5ae262f188df..0552b3def465e8d6197863d74473857feb4d2206 100644 (file)
--- a/base/geometry.rs
+++ b/base/geometry.rs
@@ -46,6 +46,7 @@ macro_rules! checked_inherent { {$n:ident($($formal:tt)*) $($actual:tt)*} => {
   }
 } }
 
+#[allow(clippy::only_used_in_recursion)] // FP nightly (1bfe40d11 2022-03-18
 impl CheckedArith for i32 {
   checked_inherent!{checked_add(, rhs: Self) rhs}
   checked_inherent!{checked_sub(, rhs: Self) rhs}

diff --git a/clippy-options b/clippy-options
index dfac59036f0db75b729d61fa8842314d809f4806..87cccb595d131be33222049db219d2b97c4f062d 100644 (file)
--- a/clippy-options
+++ b/clippy-options
@@ -41,3 +41,7 @@
 -A clippy::needless_update
 -A clippy::comparison_chain
 -A clippy::bool_comparison
+-A clippy::nonminimal_bool
+-A clippy::needless_match
+-A clippy::from_over_into # buggy in 1.61.0-nightly (1bfe40d11 2022-03-18)
+-A clippy::await_holding_lock # moans about synch mutex in async

diff --git a/src/bin/otterlib.rs b/src/bin/otterlib.rs
index 5d2da22fe91efc23f9dce2ad8110a2e628e064b7..f42f4e64400aa425866a2166e3a6d13ba6ca94af 100644 (file)
--- a/src/bin/otterlib.rs
+++ b/src/bin/otterlib.rs
@@ -176,8 +176,7 @@ fn preview(items: Vec<ItemForOutput>) {
       if face < (p.nfaces() as usize) {
         let viewport =
           [bbox[0].clone(), size.clone()]
-          .iter().cloned()
-          .flatten()
+          .iter().flatten().cloned()
           .map(|c| c.to_string())
           .join(" ");
         let wh = size.iter().map(|&s| s * SVG_SCALE)

diff --git a/src/dice.rs b/src/dice.rs
index 8ea6c85d45f629bf8ce449ce9c4df88ddd9fe16a..b2597784dcb406ae27f2677ff3ca2277502ecdbc 100644 (file)
--- a/src/dice.rs
+++ b/src/dice.rs
@@ -144,7 +144,7 @@ impl PieceSpec for Spec {
       let n = labels.len();
       let n = n.try_into().map_err(|_| SpecError::FarTooManyFaces(n))?;
       set_nfaces(n, "labels")?;
-      labels.into()
+      labels
     } else {
       index_vec!["".into()]
     };
@@ -453,7 +453,7 @@ impl InertPieceTrait for Die {
     
 
     let tc = OverlayTemplateContext {
-      label_text: &label,
+      label_text: label,
       label_font_size,
       label_y_adjust: label_font_size * SVG_FONT_Y_ADJUST_OF_FONT_SIZE,
 

diff --git a/src/shapelib.rs b/src/shapelib.rs
index f1e6bef66a1df85c27ae1ba282ef6c846847f691..2ef4e32a7f66c24bec4634655be9ebc8456840aa 100644 (file)
--- a/src/shapelib.rs
+++ b/src/shapelib.rs
@@ -227,7 +227,7 @@ impl OutlineTrait for ItemInertForOcculted { delegate! { to self.outline {
 #[dyn_upcast]
 impl PieceBaseTrait for ItemInertForOcculted {
   fn nfaces(&self) -> RawFaceId { 1 }
-  fn itemname(&self) -> &str { &self.itemname.as_str() }
+  fn itemname(&self) -> &str { self.itemname.as_str() }
 }
 #[typetag::serde(name="Lib")]
 impl InertPieceTrait for ItemInertForOcculted {
@@ -350,7 +350,7 @@ impl Item {
       let svgd = &self.svgs[face.svg];
       face.xform.write_svgd(f, svgd)?;
     } else if let Some(back) = &self.back {
-      back.svg(f, vpid, default(), &xdata)?;
+      back.svg(f, vpid, default(), xdata)?;
     } else {
       throw!(internal_error_bydebug(&(self, face)))
     }