apply clippy suggestions

Author: facundoolano

src/game/battle.rs

@@ -45,7 +45,7 @@ pub fn run(game: &mut Game, enemy: &mut Character, random: &dyn Randomizer) -> R
 
 fn player_attack(game: &Game, enemy: &mut Character, random: &dyn Randomizer) -> i32 {
     let (damage, new_xp) = attack(&game.player, enemy, random);
-    log::player_attack(&enemy, damage);
+    log::player_attack(enemy, damage);
     new_xp
 }
 
@@ -64,8 +64,8 @@ fn attack(
     if random.is_miss(attacker.speed, receiver.speed) {
         (Attack::Miss, 0)
     } else {
-        let damage = random.damage(attacker.damage(&receiver));
-        let xp = attacker.xp_gained(&receiver, damage);
+        let damage = random.damage(attacker.damage(receiver));
+        let xp = attacker.xp_gained(receiver, damage);
 
         if random.is_critical() {
             let damage = damage * 2;
@@ -87,7 +87,7 @@ fn autopotion(game: &mut Game, enemy: &Character) -> bool {
 
     // If there's a good chance of winning the battle on the next attack,
     // don't use the potion.
-    let potential_damage = game.player.damage(&enemy);
+    let potential_damage = game.player.damage(enemy);
     if potential_damage >= enemy.current_hp {
         return false;
     }

src/game/mod.rs

@@ -72,7 +72,7 @@ impl Game {
     /// at a time, with some chance of enemies appearing on each one.
     pub fn go_to(&mut self, dest: &Location, run: bool, bribe: bool) -> Result<(), Error> {
         while self.location != *dest {
-            self.visit(self.location.go_to(&dest));
+            self.visit(self.location.go_to(dest));
 
             if !self.location.is_home() {
                 if let Some(mut enemy) = self.maybe_spawn_enemy() {
@@ -200,7 +200,7 @@ impl Game {
             self.gold += gold;
             let level_up = self.player.add_experience(xp);
 
-            log::battle_won(&self, xp, level_up, gold);
+            log::battle_won(self, xp, level_up, gold);
             Ok(())
         } else {
             // leave hero items in the location

src/item/shop.rs

@@ -36,7 +36,7 @@ pub fn buy(game: &mut Game, item: &str) -> Result<(), Error> {
 /// Build a list of items currently available at the shop
 fn available_items(player: &Character) -> Vec<(String, Box<dyn Shoppable>)> {
     let mut items = Vec::<(String, Box<dyn Shoppable>)>::new();
-    let level = available_level(&player);
+    let level = available_level(player);
 
     let sword = Sword::new(level);
     if sword.is_upgrade_from(&player.sword.as_ref()) {

src/location.rs

@@ -41,11 +41,11 @@ impl Location {
 
     /// Return a new location that it's one dir closer to the given destination.
     pub fn go_to(&self, dest: &Self) -> Self {
-        let next = if !dest.path.starts_with(&self.path) {
-            self.path.parent().unwrap().to_path_buf()
-        } else {
+        let next = if dest.path.starts_with(&self.path) {
             let self_len = self.path.components().count();
             dest.path.components().take(self_len + 1).collect()
+        } else {
+            self.path.parent().unwrap().to_path_buf()
         };
         Self { path: next }
     }

src/log.rs

@@ -32,30 +32,30 @@ pub fn status(game: &Game) {
     } else if quiet() {
         short_status(game);
     } else {
-        long_status(&game)
+        long_status(game)
     }
 }
 
 pub fn enemy_appears(enemy: &Character, location: &Location) {
-    log(&enemy, &location, "");
+    log(enemy, location, "");
 }
 
 pub fn bribe_success(player: &Character, amount: i32) {
     let suffix = format!("bribed {}", format!("-{}g", amount).yellow());
-    battle_log(&player, &suffix);
+    battle_log(player, &suffix);
     println!();
 }
 
 pub fn bribe_failure(player: &Character) {
-    battle_log(&player, "can't bribe!");
+    battle_log(player, "can't bribe!");
 }
 
 pub fn run_away_success(player: &Character) {
-    battle_log(&player, "fled!");
+    battle_log(player, "fled!");
 }
 
 pub fn run_away_failure(player: &Character) {
-    battle_log(&player, "can't run!");
+    battle_log(player, "can't run!");
 }
 
 pub fn tombstone(location: &Location, items: &[String], gold: i32) {
@@ -73,8 +73,8 @@ pub fn tombstone(location: &Location, items: &[String], gold: i32) {
 pub fn heal(player: &Character, location: &Location, recovered: i32) {
     if recovered > 0 {
         log(
-            &player,
-            &location,
+            player,
+            location,
             &format!("+{}hp", recovered).green().to_string(),
         );
     }
@@ -83,26 +83,26 @@ pub fn heal(player: &Character, location: &Location, recovered: i32) {
 pub fn potion(player: &Character, recovered: i32) {
     if recovered > 0 {
         battle_log(
-            &player,
+            player,
             &format!("+{}hp potion", recovered).green().to_string(),
         );
     }
 }
 
 pub fn player_attack(enemy: &Character, attack: Attack) {
     if !quiet() {
-        battle_log(&enemy, &format_attack(attack, "white"));
+        battle_log(enemy, &format_attack(attack, "white"));
     }
 }
 
 pub fn enemy_attack(player: &Character, attack: Attack) {
     if !quiet() {
-        battle_log(&player, &format_attack(attack, "bright red"));
+        battle_log(player, &format_attack(attack, "bright red"));
     }
 }
 
 pub fn battle_lost(player: &Character) {
-    battle_log(&player, "\u{1F480}");
+    battle_log(player, "\u{1F480}");
 }
 
 pub fn battle_won(game: &Game, xp: i32, levels_up: i32, gold: i32) {
@@ -129,16 +129,16 @@ fn long_status(game: &Game) {
     let player = &game.player;
     let location = &game.location;
 
-    println!("{}@{}", format_character(&player), location);
+    println!("{}@{}", format_character(player), location);
     println!(
         "    hp:{} {}/{}",
-        hp_display(&player, 10),
+        hp_display(player, 10),
         player.current_hp,
         player.max_hp
     );
     println!(
         "    xp:{} {}/{}",
-        xp_display(&player, 10),
+        xp_display(player, 10),
         player.xp,
         player.xp_for_next()
     );
@@ -148,8 +148,8 @@ fn long_status(game: &Game) {
         player.deffense(),
         player.speed
     );
-    println!("    {}", format_equipment(&player));
-    println!("    {}", format_inventory(&game));
+    println!("    {}", format_equipment(player));
+    println!("    {}", format_inventory(game));
     println!("    {}", format_gold(game.gold));
 }
 
@@ -193,9 +193,9 @@ pub fn shop_list(game: &Game, items: Vec<Box<dyn shop::Shoppable>>) {
 fn log(character: &Character, location: &Location, suffix: &str) {
     println!(
         "{}{}{}@{} {}",
-        format_character(&character),
-        hp_display(&character, 4),
-        xp_display(&character, 4),
+        format_character(character),
+        hp_display(character, 4),
+        xp_display(character, 4),
         location,
         suffix
     );
@@ -204,8 +204,8 @@ fn log(character: &Character, location: &Location, suffix: &str) {
 fn battle_log(character: &Character, suffix: &str) {
     println!(
         "{}{} {}",
-        format_character(&character),
-        hp_display(&character, 4),
+        format_character(character),
+        hp_display(character, 4),
         suffix
     );
 }