From 2c14b2f891f8fd3080777735ed459ba9adb6fb6f Mon Sep 17 00:00:00 2001
From: jshipsey <jshipsey18@gmail.com>
Date: Sun, 5 Jul 2020 09:37:58 -0400
Subject: [PATCH] clippy fixes

---
 common/src/path.rs                           | 33 +++++++++-----------
 voxygen/src/anim/src/quadruped_low/run.rs    |  2 +-
 voxygen/src/anim/src/quadruped_medium/run.rs |  2 +-
 3 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/common/src/path.rs b/common/src/path.rs
index 894a721cfb..cace57e210 100644
--- a/common/src/path.rs
+++ b/common/src/path.rs
@@ -75,7 +75,7 @@ impl Route {
     where
         V: BaseVol<Vox = Block> + ReadVol,
     {
-        let next0 = self.next(0).unwrap_or(pos.map(|e| e.floor() as i32));
+        let next0 = self.next(0).unwrap_or_else(|| pos.map(|e| e.floor() as i32));
         let next1 = self.next(1).unwrap_or(next0);
         if vol.get(next0).map(|b| b.is_solid()).unwrap_or(false) {
             None
@@ -122,14 +122,14 @@ impl Route {
 
             let cb = CubicBezier2 {
                 start: pos.xy(),
-                ctrl0: pos.xy() + vel.xy().try_normalized().unwrap_or(Vec2::zero()),
+                ctrl0: pos.xy() + vel.xy().try_normalized().unwrap_or_else(Vec2::zero),
                 ctrl1: align(next0),
                 end: align(next1),
             };
 
             let tgt2d = cb.evaluate(0.5);
             let tgt = Vec3::from(tgt2d) + Vec3::unit_z() * next_tgt.z;
-            let tgt_dir = (tgt - pos).xy().try_normalized().unwrap_or(Vec2::unit_y());
+            let tgt_dir = (tgt - pos).xy().try_normalized().unwrap_or_else(Vec2::unit_y);
             let next_dir = cb
                 .evaluate_derivative(0.5)
                 .try_normalized()
@@ -144,7 +144,7 @@ impl Route {
             Some((
                 tgt - pos,
                 next_dir
-                    .dot(vel.xy().try_normalized().unwrap_or(Vec2::zero()))
+                    .dot(vel.xy().try_normalized().unwrap_or_else(Vec2::zero))
                     .max(0.0)
                     * 0.75
                     + 0.25,
@@ -187,21 +187,16 @@ impl Chaser {
 
         let bearing = if let Some(end) = self.route.as_ref().and_then(|r| r.path().end().copied()) {
             let end_to_tgt = end.map(|e| e as f32).distance(tgt);
-            if end_to_tgt > pos_to_tgt * 0.3 + 5.0 {
-                None
-            } else {
-                if thread_rng().gen::<f32>() < 0.005 {
-                    // Randomly repath to avoid getting stuck
-                    None
-                } else {
-                    self.route
-                        .as_mut()
-                        .and_then(|r| r.traverse(vol, pos, vel, traversal_tolerance))
-                }
-            }
-        } else {
-            None
-        };
+    if end_to_tgt > pos_to_tgt * 0.3 + 5.0 || thread_rng().gen::<f32>() < 0.005 {
+        None
+    } else {
+            self.route
+                .as_mut()
+                .and_then(|r| r.traverse(vol, pos, vel, traversal_tolerance))
+        }
+} else {
+    None
+};
 
         // TODO: What happens when we get stuck?
         if let Some(bearing) = bearing {
diff --git a/voxygen/src/anim/src/quadruped_low/run.rs b/voxygen/src/anim/src/quadruped_low/run.rs
index f9ee904a40..eaea7229e6 100644
--- a/voxygen/src/anim/src/quadruped_low/run.rs
+++ b/voxygen/src/anim/src/quadruped_low/run.rs
@@ -10,7 +10,7 @@ impl Animation for RunAnimation {
 
     #[cfg(feature = "use-dyn-lib")]
     const UPDATE_FN: &'static [u8] = b"quadruped_low_run\0";
-
+    #[allow(clippy::useless_conversion)] // TODO: Pending review in #587
     #[cfg_attr(feature = "be-dyn-lib", export_name = "quadruped_low_run")]
     fn update_skeleton_inner(
         skeleton: &Self::Skeleton,
diff --git a/voxygen/src/anim/src/quadruped_medium/run.rs b/voxygen/src/anim/src/quadruped_medium/run.rs
index 62df4aabb4..99a4bea5bd 100644
--- a/voxygen/src/anim/src/quadruped_medium/run.rs
+++ b/voxygen/src/anim/src/quadruped_medium/run.rs
@@ -10,7 +10,7 @@ impl Animation for RunAnimation {
 
     #[cfg(feature = "use-dyn-lib")]
     const UPDATE_FN: &'static [u8] = b"quadruped_medium_run\0";
-
+    #[allow(clippy::useless_conversion)] // TODO: Pending review in #587
     #[cfg_attr(feature = "be-dyn-lib", export_name = "quadruped_medium_run")]
     fn update_skeleton_inner(
         skeleton: &Self::Skeleton,