cleans up imports

src/effects/hunger.rs

@@ -1,5 +1,5 @@
 use super::{
-    triggers::{BLESSED, CURSED, UNCURSED},
+    triggers::{BLESSED, UNCURSED},
     EffectSpawner, EffectType,
 };
 use crate::{HungerClock, HungerState};

src/effects/triggers.rs

@@ -117,6 +117,7 @@ fn handle_damage(ecs: &mut World, event: &mut EventInfo, mut logger: gamelog::Lo
     return logger;
 }
 
+#[allow(unused_mut)]
 fn handle_confusion(ecs: &mut World, event: &mut EventInfo, mut logger: gamelog::Logger) -> gamelog::Logger {
     if let Some(confusion) = ecs.read_storage::<Confusion>().get(event.entity) {
         add_effect(event.source, EffectType::Confusion { turns: confusion.turns }, event.target.clone());

src/inventory/collection_system.rs

@@ -1,8 +1,7 @@
-use super::{
+use crate::{
-    gamelog, EquipmentChanged, InBackpack, MagicItem, MasterDungeonMap, Name, ObfuscatedName, Position, Wand,
+    gamelog, gui::obfuscate_name, EquipmentChanged, InBackpack, MagicItem, MasterDungeonMap, Name, ObfuscatedName,
-    WantsToPickupItem,
+    Position, Wand, WantsToPickupItem,
 };
-use crate::gui::obfuscate_name;
 use specs::prelude::*;
 
 pub struct ItemCollectionSystem {}

src/inventory/drop_system.rs

@@ -1,8 +1,7 @@
-use super::{
+use crate::{
-    gamelog, EquipmentChanged, InBackpack, MagicItem, MasterDungeonMap, Name, ObfuscatedName, Position, Wand,
+    gamelog, gui::obfuscate_name, EquipmentChanged, InBackpack, MagicItem, MasterDungeonMap, Name, ObfuscatedName,
-    WantsToDropItem,
+    Position, Wand, WantsToDropItem,
 };
-use crate::gui::obfuscate_name;
 use specs::prelude::*;
 
 pub struct ItemDropSystem {}

src/inventory/equip_system.rs

@@ -1,8 +1,9 @@
-use super::{
+use crate::{
-    gamelog, EquipmentChanged, Equippable, Equipped, InBackpack, MagicItem, MasterDungeonMap, Name, ObfuscatedName,
+    gamelog,
+    gui::{item_colour, obfuscate_name},
+    EquipmentChanged, Equippable, Equipped, InBackpack, MagicItem, MasterDungeonMap, Name, ObfuscatedName,
     WantsToUseItem,
 };
-use crate::gui::{item_colour, obfuscate_name};
 use specs::prelude::*;
 
 pub struct ItemEquipSystem {}

src/inventory/identification_system.rs

@@ -1,5 +1,4 @@
-use super::{IdentifiedItem, MasterDungeonMap, Name, ObfuscatedName};
+use crate::{IdentifiedItem, Item, MasterDungeonMap, Name, ObfuscatedName, Player};
-use crate::{Item, Player};
 use specs::prelude::*;
 
 pub struct ItemIdentificationSystem {}

src/inventory/mod.rs

@@ -1,11 +1,3 @@
-use super::{
-    gamelog, Confusion, Consumable, Cursed, Destructible, Digger, EquipmentChanged, Equippable, Equipped, HungerClock,
-    HungerState, IdentifiedItem, InBackpack, InflictsDamage, MagicItem, MagicMapper, Map, MasterDungeonMap, Name,
-    ObfuscatedName, ParticleBuilder, Point, Pools, Position, ProvidesHealing, ProvidesNutrition, RandomNumberGenerator,
-    RunState, TileType, Viewshed, Wand, WantsToDropItem, WantsToPickupItem, WantsToRemoveItem, WantsToUseItem, AOE,
-    DEFAULT_PARTICLE_LIFETIME, LONG_PARTICLE_LIFETIME,
-};
-
 mod collection_system;
 mod drop_system;
 mod equip_system;

src/inventory/remove_system.rs

@@ -1,5 +1,8 @@
-use super::{gamelog, Equipped, InBackpack, MagicItem, MasterDungeonMap, Name, ObfuscatedName, WantsToRemoveItem};
+use crate::{
-use crate::gui::{item_colour, obfuscate_name};
+    gamelog,
+    gui::{item_colour, obfuscate_name},
+    Equipped, InBackpack, MagicItem, MasterDungeonMap, Name, ObfuscatedName, WantsToRemoveItem,
+};
 use specs::prelude::*;
 
 pub struct ItemRemoveSystem {}

src/inventory/use_system.rs

@@ -1,5 +1,7 @@
-use super::{EquipmentChanged, IdentifiedItem, Map, Name, WantsToUseItem, AOE};
+use crate::{
-use crate::effects::*;
+    effects::{add_effect, aoe_tiles, EffectType, Targets},
+    EquipmentChanged, IdentifiedItem, Map, Name, WantsToUseItem, AOE,
+};
 use specs::prelude::*;
 
 pub struct ItemUseSystem {}

src/particle_system.rs

@@ -150,17 +150,6 @@ impl ParticleBuilder {
         );
     }
 
-    pub fn heal(&mut self, x: i32, y: i32) {
-        self.request(
-            x,
-            y,
-            rltk::RGB::named(rltk::GREEN),
-            rltk::RGB::named(rltk::BLACK),
-            rltk::to_cp437('♥'),
-            DEFAULT_PARTICLE_LIFETIME,
-        );
-    }
-
     pub fn kick(&mut self, x: i32, y: i32) {
         self.request(
             x,
@@ -194,6 +183,7 @@ impl ParticleBuilder {
     }
 
     // Makes a rainbow particle request in the shape of an 'x'. Sort of.
+    #[allow(dead_code)]
     pub fn request_rainbow_star(&mut self, x: i32, y: i32, glyph: rltk::FontCharType, lifetime: f32) {
         let bg = RGB::named(rltk::BLACK);
         let eighth_l = lifetime / 8.0;