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 e7ab100399f789c7b7254c1a508530c4b8ecee36..3586d41d92bc3e0219bedd9bfa6800b3957ffeb7 100644 (file)
--- a/clippy-options
+++ b/clippy-options
@@ -16,3 +16,6 @@
 -A clippy::single_match
 -A clippy::too_many_arguments # yes, I know
 -A clippy::never_loop # control flow bodge
+-A clippy::needless_splitn
+-A clippy::type_complexity
+-A clippy::redundant_closure

diff --git a/src/bundles.rs b/src/bundles.rs
index 390b4a4186a52bed566f5bd8820e99356e7fc279..d59d1276182fc8460e6d567f56733140d9466a82 100644 (file)
--- a/src/bundles.rs
+++ b/src/bundles.rs
@@ -1060,7 +1060,7 @@ impl InstanceBundles {
       IE
       >>
   {
-    let bd = b_dir(&instance);
+    let bd = b_dir(instance);
     let mo = glob::MatchOptions {
       require_literal_leading_dot: true,
       ..default()

diff --git a/src/clock.rs b/src/clock.rs
index 2845431ee4fb886eeee078749846348d913bef94..af8fc00afcecb4fded7fc5e686e415d4b29a0a5b 100644 (file)
--- a/src/clock.rs
+++ b/src/clock.rs
@@ -412,7 +412,7 @@ impl PieceSpec for Spec {
       spec: self.clone(),
     };
 
-    gpc.xdata_mut(|| State::new(&self) )?;
+    gpc.xdata_mut(|| State::new(self) )?;
 
     PieceSpecLoaded {
       p: Box::new(clock),
@@ -442,7 +442,7 @@ impl PieceTrait for Clock {
                vpid: VisiblePieceId) {
     let state = gpc.xdata()?
       .ok_or_else(|| internal_logic_error("missing/wrong xdata"))?;
-    let urenders = self.urender(&state, gpc.held, &gs.players);
+    let urenders = self.urender(state, gpc.held, &gs.players);
 
     // player missing, nick is red and pink
 
@@ -491,10 +491,7 @@ impl PieceTrait for Clock {
       let mins = u.remaining.tv_sec() / 60;
       let secs = u.remaining.tv_sec() % 60;
       let mins = mins.to_string();
-      let mins_pad = Html::from_html_string(
-        iter::repeat(" ").take(3 - mins.len())
-          .collect()
-      );
+      let mins_pad = Html::from_html_string(" ".repeat(3 - mins.len()));
 
       let pointer = Html::lit(r##"
   pointer-events="none"