From ba5d120fef177083b7a8bbd56b5b8d62b38882a3 Mon Sep 17 00:00:00 2001
From: Llywelwyn <lewiiswynne@gmail.com>
Date: Sat, 15 Jun 2024 20:40:51 +0100
Subject: [PATCH] fix warns, bump ver

---
 Cargo.toml                         |  2 +-
 src/gui/identify_menu.rs           |  5 +----
 src/gui/mod.rs                     |  4 ++--
 src/gui/remove_curse_menu.rs       | 16 +---------------
 src/inventory/collection_system.rs |  6 ------
 src/invkeys.rs                     |  3 +--
 6 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 24b6918..4ef01ec 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rust-rl"
-version = "0.1.1"
+version = "0.1.2"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/src/gui/identify_menu.rs b/src/gui/identify_menu.rs
index 422b2a5..31ce8d7 100644
--- a/src/gui/identify_menu.rs
+++ b/src/gui/identify_menu.rs
@@ -5,11 +5,8 @@ use super::{
     print_options,
     unique_ecs,
     check_key,
-    renderable_colour,
     letter_to_option,
     ItemMenuResult,
-    UniqueInventoryItem,
-    BUC,
 };
 use crate::{
     gamelog,
@@ -99,7 +96,7 @@ pub fn identify(gs: &mut State, ctx: &mut BTerm) -> (ItemMenuResult, Option<Enti
         return (ItemMenuResult::Selected, Some(build_identify_iterator().nth(0).unwrap().0));
     }
     let mut player_inventory: super::PlayerInventory = HashMap::new();
-    for (entity, _i, renderable, name, key) in build_identify_iterator() {
+    for (entity, _i, _r, _n, key) in build_identify_iterator() {
         let unique_item = unique_ecs(&gs.ecs, entity);
         player_inventory
             .entry(unique_item)
diff --git a/src/gui/mod.rs b/src/gui/mod.rs
index 73c70f5..5a50698 100644
--- a/src/gui/mod.rs
+++ b/src/gui/mod.rs
@@ -46,7 +46,7 @@ use crate::data::visuals::{
 };
 use bracket_lib::prelude::*;
 use specs::prelude::*;
-use std::collections::{ HashMap, HashSet };
+use std::collections::HashMap;
 use crate::invkeys::check_key;
 
 mod character_creation;
@@ -485,7 +485,7 @@ pub enum ItemMenuResult {
 }
 
 pub fn print_options(
-    ecs: &World,
+    _ecs: &World,
     inventory: &PlayerInventory,
     mut x: i32,
     mut y: i32,
diff --git a/src/gui/remove_curse_menu.rs b/src/gui/remove_curse_menu.rs
index 247fd41..68cea65 100644
--- a/src/gui/remove_curse_menu.rs
+++ b/src/gui/remove_curse_menu.rs
@@ -4,11 +4,9 @@ use super::{
     obfuscate_name_ecs,
     print_options,
     unique_ecs,
-    renderable_colour,
     check_key,
     letter_to_option,
     ItemMenuResult,
-    UniqueInventoryItem,
     InventorySlot,
 };
 use crate::{
@@ -93,19 +91,7 @@ pub fn remove_curse(gs: &mut State, ctx: &mut BTerm) -> (ItemMenuResult, Option<
         return (ItemMenuResult::Selected, Some(item));
     }
     let mut player_inventory: super::PlayerInventory = HashMap::new();
-    for (entity, _i, _b, renderable, name, key) in build_cursed_iterator() {
-        let (singular, plural) = obfuscate_name_ecs(&gs.ecs, entity);
-        let beatitude_status = if
-            let Some(beatitude) = gs.ecs.read_storage::<Beatitude>().get(entity)
-        {
-            match beatitude.buc {
-                BUC::Blessed => 1,
-                BUC::Uncursed => 2,
-                BUC::Cursed => 3,
-            }
-        } else {
-            0
-        };
+    for (entity, _i, _b, _r, _n, key) in build_cursed_iterator() {
         let unique_item = unique_ecs(&gs.ecs, entity);
         player_inventory
             .entry(unique_item)
diff --git a/src/inventory/collection_system.rs b/src/inventory/collection_system.rs
index 5ef9619..70fb25c 100644
--- a/src/inventory/collection_system.rs
+++ b/src/inventory/collection_system.rs
@@ -13,8 +13,6 @@ use crate::{
     Position,
     WantsToPickupItem,
     WantsToAssignKey,
-    Renderable,
-    Stackable,
 };
 use specs::prelude::*;
 use crate::data::messages;
@@ -33,12 +31,10 @@ impl<'a> System<'a> for ItemCollectionSystem {
         WriteStorage<'a, EquipmentChanged>,
         ReadStorage<'a, MagicItem>,
         ReadStorage<'a, ObfuscatedName>,
-        ReadStorage<'a, Renderable>,
         ReadStorage<'a, Beatitude>,
         ReadExpect<'a, MasterDungeonMap>,
         ReadStorage<'a, Charges>,
         ReadStorage<'a, WantsToAssignKey>,
-        ReadStorage<'a, Stackable>,
     );
 
     fn run(&mut self, data: Self::SystemData) {
@@ -51,12 +47,10 @@ impl<'a> System<'a> for ItemCollectionSystem {
             mut equipment_changed,
             magic_items,
             obfuscated_names,
-            renderables,
             beatitudes,
             dm,
             wands,
             wants_key,
-            stackable,
         ) = data;
         let mut to_remove: Vec<Entity> = Vec::new();
         // For every item that wants to be picked up that *isn't* waiting on a key assignment.
diff --git a/src/invkeys.rs b/src/invkeys.rs
index e52824b..2cee2f4 100644
--- a/src/invkeys.rs
+++ b/src/invkeys.rs
@@ -1,6 +1,5 @@
 use std::sync::Mutex;
-use std::collections::{ HashMap };
-use specs::prelude::*;
+use std::collections::HashMap;
 use crate::gui::UniqueInventoryItem;
 
 lazy_static! {