From 75f5c0543b7369990ec5e15ef3b8b34df04251e1 Mon Sep 17 00:00:00 2001
From: Sam <samuelkeiffer@gmail.com>
Date: Wed, 2 Jun 2021 18:06:58 -0500
Subject: [PATCH] Fmt and clippy from toolchain rebase.
---
voxygen/anim/src/biped_large/alpha.rs | 3 +--
voxygen/anim/src/biped_large/beam.rs | 1 +
voxygen/anim/src/biped_large/stunned.rs | 8 +++++---
voxygen/anim/src/biped_large/summon.rs | 1 +
4 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/voxygen/anim/src/biped_large/alpha.rs b/voxygen/anim/src/biped_large/alpha.rs
index f09e75ea2a..b752566a0c 100644
--- a/voxygen/anim/src/biped_large/alpha.rs
+++ b/voxygen/anim/src/biped_large/alpha.rs
@@ -233,7 +233,6 @@ impl Animation for AlphaAnimation {
Quaternion::rotation_x(PI / 3.0) * Quaternion::rotation_z(0.35);
next.shoulder_r.orientation = Quaternion::rotation_x(0.0);
- next.torso.position = Vec3::new(0.0, move2 * -2.2, move2 * -1.0);
} else {
next.head.orientation = Quaternion::rotation_z(move1 * -0.75);
next.upper_torso.orientation =
@@ -263,8 +262,8 @@ impl Animation for AlphaAnimation {
* Quaternion::rotation_z(-0.35);
next.shoulder_l.orientation = Quaternion::rotation_x(0.0);
- next.torso.position = Vec3::new(0.0, move2 * -2.2, move2 * -1.0);
};
+ next.torso.position = Vec3::new(0.0, move2 * -2.2, move2 * -1.0);
},
"Minotaur" => {
next.control_l.position = Vec3::new(0.0, 4.0, 5.0);
diff --git a/voxygen/anim/src/biped_large/beam.rs b/voxygen/anim/src/biped_large/beam.rs
index 0d5c92a31a..9bf1828295 100644
--- a/voxygen/anim/src/biped_large/beam.rs
+++ b/voxygen/anim/src/biped_large/beam.rs
@@ -11,6 +11,7 @@ use std::f32::consts::PI;
pub struct BeamAnimation;
impl Animation for BeamAnimation {
+ #[allow(clippy::type_complexity)]
type Dependency<'a> = (
(Option<ToolKind>, Option<&'a AbilitySpec>),
(Option<ToolKind>, Option<&'a AbilitySpec>),
diff --git a/voxygen/anim/src/biped_large/stunned.rs b/voxygen/anim/src/biped_large/stunned.rs
index dfa3d0861f..7ca21c4246 100644
--- a/voxygen/anim/src/biped_large/stunned.rs
+++ b/voxygen/anim/src/biped_large/stunned.rs
@@ -213,9 +213,11 @@ impl Animation for StunnedAnimation {
Quaternion::rotation_x(PI / 3.0) * Quaternion::rotation_y(0.15);
},
"Tidal Warrior" => {
- next.head.orientation = Quaternion::rotation_x(move1 * -2.0);
- next.upper_torso.orientation = Quaternion::rotation_z(move1 * 1.0);
- next.lower_torso.orientation = Quaternion::rotation_z(move1 * -1.0);
+ next.head.orientation = Quaternion::rotation_x(movement1 * -2.0);
+ next.upper_torso.orientation =
+ Quaternion::rotation_z(movement1 * 1.0);
+ next.lower_torso.orientation =
+ Quaternion::rotation_z(movement1 * -1.0);
next.hand_l.position = Vec3::new(-14.0, 2.0, -4.0);
next.hand_r.position = Vec3::new(14.0, 2.0, -4.0);
diff --git a/voxygen/anim/src/biped_large/summon.rs b/voxygen/anim/src/biped_large/summon.rs
index 6c9ad4397a..c3a5952dcd 100644
--- a/voxygen/anim/src/biped_large/summon.rs
+++ b/voxygen/anim/src/biped_large/summon.rs
@@ -11,6 +11,7 @@ use std::f32::consts::PI;
pub struct SummonAnimation;
impl Animation for SummonAnimation {
+ #[allow(clippy::type_complexity)]
type Dependency<'a> = (
(Option<ToolKind>, Option<&'a AbilitySpec>),
(Option<ToolKind>, Option<&'a AbilitySpec>),