From f0786ac24b395ed6031bcc75ea50917a4a08643f Mon Sep 17 00:00:00 2001
From: Niklas Eicker <git@nikl.me>
Date: Sat, 15 Jan 2022 22:51:00 +0100
Subject: [PATCH] Bump version to 1.6 and fix clippy issues

---
 Cargo.lock     |  2 +-
 Cargo.toml     |  2 +-
 src/bullets.rs | 11 ++++-------
 src/enemies.rs |  2 +-
 src/loading.rs | 16 ++++++++--------
 src/menu.rs    |  6 +++---
 src/towers.rs  |  6 +++---
 src/ui.rs      |  6 +++---
 8 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 645d5f6..f5c7179 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2357,7 +2357,7 @@ dependencies = [
 
 [[package]]
 name = "oicana"
-version = "1.5.0"
+version = "1.6.0"
 dependencies = [
  "bevy",
  "bevy_asset_loader",
diff --git a/Cargo.toml b/Cargo.toml
index c877aec..e238126 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "oicana"
 description = "A tower-defense game with some puzzle aspects"
-version = "1.5.0"
+version = "1.6.0"
 authors = ["Niklas Eicker <git@nikl.me>"]
 edition = "2021"
 publish = false
diff --git a/src/bullets.rs b/src/bullets.rs
index d0a0846..6d66905 100644
--- a/src/bullets.rs
+++ b/src/bullets.rs
@@ -24,11 +24,8 @@ pub struct Bullet {
 
 fn update_bullets(
     mut commands: Commands,
-    mut bullet_query: Query<(Entity, &Bullet, &mut Transform)>,
-    mut enemy_query: Query<
-        (&Transform, &mut Health, &mut Enemy),
-        (Without<Tameable>, Without<Bullet>),
-    >,
+    mut bullet_query: Query<(Entity, &Bullet, &mut Transform), Without<Enemy>>,
+    mut enemy_query: Query<(&Transform, &mut Health, &mut Enemy), Without<Tameable>>,
     time: Res<Time>,
 ) {
     let delta = time.delta().as_secs_f32();
@@ -42,13 +39,13 @@ fn update_bullets(
                 if distance.length() < bullet.speed * delta {
                     health.value -= bullet.damage;
                     commands.entity(bullet_entity).despawn();
-                    to_remove.push(bullet_id.clone());
+                    to_remove.push(*bullet_id);
                 } else {
                     let movement = distance.normalize() * bullet.speed * delta;
                     transform.translation += movement;
                 }
             } else {
-                to_remove.push(bullet_id.clone());
+                to_remove.push(*bullet_id);
             }
         }
         enemy.bullets = enemy
diff --git a/src/enemies.rs b/src/enemies.rs
index e93eb32..ed42d66 100644
--- a/src/enemies.rs
+++ b/src/enemies.rs
@@ -183,7 +183,7 @@ fn create_enemy(
         max_health: health,
         bullets: vec![],
         colored_health: health,
-        color: color.clone(),
+        color,
         travelled: 0.,
     };
     commands
diff --git a/src/loading.rs b/src/loading.rs
index 70fc11f..fca4ec0 100644
--- a/src/loading.rs
+++ b/src/loading.rs
@@ -53,14 +53,14 @@ pub struct TextureAssets {
 
 impl TextureAssets {
     pub fn get_handle_for_tile(&self, tile: &Tile) -> Handle<Image> {
-        match tile {
-            &Tile::Empty => self.blank.clone(),
-            &Tile::TowerPlot => self.tower_plot.clone(),
-            &Tile::Tower => self.tower.clone(),
-            &Tile::Path => self.path.clone(),
-            &Tile::Castle => self.castle.clone(),
-            &Tile::Cloud => self.cloud.clone(),
-            &Tile::Spawn => self.spawn.clone(),
+        match *tile {
+            Tile::Empty => self.blank.clone(),
+            Tile::TowerPlot => self.tower_plot.clone(),
+            Tile::Tower => self.tower.clone(),
+            Tile::Path => self.path.clone(),
+            Tile::Castle => self.castle.clone(),
+            Tile::Cloud => self.cloud.clone(),
+            Tile::Spawn => self.spawn.clone(),
         }
     }
 }
diff --git a/src/menu.rs b/src/menu.rs
index 7c8351f..7b9429e 100644
--- a/src/menu.rs
+++ b/src/menu.rs
@@ -30,7 +30,7 @@ fn setup_menu(
                 align_items: AlignItems::Center,
                 ..Default::default()
             },
-            color: button_colors.normal.clone(),
+            color: button_colors.normal,
             ..Default::default()
         })
         .insert(PlayButton)
@@ -68,10 +68,10 @@ fn click_play_button(
                 state.set(AppState::InGame).unwrap();
             }
             Interaction::Hovered => {
-                *color = button_colors.hovered.clone();
+                *color = button_colors.hovered;
             }
             Interaction::None => {
-                *color = button_colors.normal.clone();
+                *color = button_colors.normal;
             }
         }
     }
diff --git a/src/towers.rs b/src/towers.rs
index 2860430..a786f60 100644
--- a/src/towers.rs
+++ b/src/towers.rs
@@ -71,12 +71,12 @@ fn shoot(
                 .fold(None, |acc, (entity, _, enemy)| {
                     if let Some((_, old_travelled)) = acc {
                         if enemy.travelled > old_travelled {
-                            Some((entity.clone(), enemy.travelled))
+                            Some((entity, enemy.travelled))
                         } else {
                             acc
                         }
                     } else {
-                        Some((entity.clone(), enemy.travelled))
+                        Some((entity, enemy.travelled))
                     }
                 });
 
@@ -124,7 +124,7 @@ fn build_and_upgrade_towers(
                 if transform.translation.x == coordinate.x
                     && transform.translation.y == coordinate.y
                 {
-                    *image = texture_assets.tower.clone().into()
+                    *image = texture_assets.tower.clone()
                 }
             }
             commands.spawn_bundle(TowerBundle::new(coordinate));
diff --git a/src/ui.rs b/src/ui.rs
index df6e754..99c0ea5 100644
--- a/src/ui.rs
+++ b/src/ui.rs
@@ -162,7 +162,7 @@ fn retry_system(
                     align_items: AlignItems::Center,
                     ..Default::default()
                 },
-                color: button_materials.normal.clone(),
+                color: button_materials.normal,
                 ..Default::default()
             })
             .insert(RetryButton)
@@ -203,10 +203,10 @@ fn click_retry_button(
                 state.set(AppState::Restart).unwrap();
             }
             Interaction::Hovered => {
-                *color = button_colors.hovered.clone();
+                *color = button_colors.hovered;
             }
             Interaction::None => {
-                *color = button_colors.normal.clone();
+                *color = button_colors.normal;
             }
         }
     }