clippy: Miscellaneous minor changes

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

diff --git a/apitest/at-otter.rs b/apitest/at-otter.rs
index 79058df0fb5317d9d96f18d6b34c8b29d26fa2cc..a544a9c38217a2b45d65160bb3cd761487ca8070 100644 (file)
--- a/apitest/at-otter.rs
+++ b/apitest/at-otter.rs
@@ -245,7 +245,7 @@ impl Ctx {
 
     assert_eq!( BufReader::new(File::open(ds.subst("@authkeys@")?)?)
                 .lines().nth(2).unwrap().unwrap(),
-                STATIC_TEST.strip_suffix("\n").unwrap() );
+                STATIC_TEST.strip_suffix('\n').unwrap() );
 
     let ssh_command = ds.subst(
       "@src@/apitest/mock-ssh-restricted @authkeys@ '@dummy_key_data@'"

diff --git a/daemon/api.rs b/daemon/api.rs
index 2a56c2399f4cd43e16a1ae7039768f9720bdb472..27462cf25ee3c765c9d474b8a333bd8c85095ebe 100644 (file)
--- a/daemon/api.rs
+++ b/daemon/api.rs
@@ -130,7 +130,7 @@ fn api_piece_op<O: op::Complex>(form: Json<ApiPiece<O>>)
 
     let loose_conflict = if u_gen <= q_gen { None } else {
       if ! form.loose { throw!(Inapplicable::Conflict); }
-      Some(form.op.conflict_loose_check(&gpc, client)?)
+      Some(form.op.conflict_loose_check(gpc, client)?)
     };
     trace_dbg!("form.op", player, piece, &form.op, &gpc);
     form.op.check_held(gpc,player)?;
@@ -380,7 +380,7 @@ api_route!{
         else { None }
       };
 
-      if gs.pieces.iter().find(|&(opiece, ogpc)| {
+      if gs.pieces.iter().any(|(opiece, ogpc)| {
 
         if ogpc.zlevel < tgpc.zlevel { return false }
 
@@ -392,8 +392,8 @@ api_route!{
           else { false }
         };
         return ! cannot_overlap;
-      })
-        .is_some();
+
+      });
 
       then {
         let z = gs.max_z.z.clone_mut().increment().map_err(