clippy cleanup and use workspace lints

Cargo.toml

@@ -16,6 +16,14 @@ members = [
     "sulis_view",
 ]
 
+[workspace.lints.clippy]
+assigning_clones = "allow"
+type_complexity = "allow"
+map_clone = "allow"
+collapsible_else_if = "allow"
+collapsible_if = "allow"
+manual_range_contains = "allow"
+
 [workspace.dependencies]
 base64 = "0.21"
 chrono = "0.4"

sulis_core/Cargo.toml

@@ -4,6 +4,9 @@ version = "1.0.0"
 authors = ["Jared Stephen <grok_moo@yahoo.com>"]
 edition = "2021"
 
+[lints]
+workspace = true
+
 [dependencies]
 home = { workspace = true }
 flexi_logger = { workspace = true }

sulis_core/src/config.rs

@@ -447,7 +447,7 @@ impl Config {
         };
 
         for key in RawClick::iter() {
-            if config.input.click_actions.get(key).is_none() {
+            if !config.input.click_actions.contains_key(key) {
                 return Err(Error::new(
                     ErrorKind::InvalidData,
                     "Must specify an action for each of Left, Right & Middle Click",

sulis_core/src/io/glium_adapter.rs

@@ -141,7 +141,7 @@ impl<'a> GliumRenderer<'a> {
     }
 
     fn create_texture_if_missing(&mut self, texture_id: &str, draw_list: &DrawList) {
-        if self.display.textures.get(texture_id).is_some() {
+        if self.display.textures.contains_key(texture_id) {
             return;
         }
 

sulis_core/src/lib.rs

@@ -14,8 +14,6 @@
 //  You should have received a copy of the GNU General Public License
 //  along with Sulis.  If not, see <http://www.gnu.org/licenses/>
 
-#![allow(clippy::type_complexity)]
-
 pub extern crate serde;
 pub extern crate serde_json;
 pub extern crate serde_yaml;

sulis_core/src/resource.rs

@@ -354,7 +354,6 @@ pub fn all_resources<V: ?Sized>(map: &HashMap<String, Rc<V>>) -> Vec<Rc<V>> {
 }
 
 pub fn get_resource<V: ?Sized>(id: &str, map: &HashMap<String, Rc<V>>) -> Option<Rc<V>> {
-    #[allow(clippy::map_clone)]
     map.get(id).map(Rc::clone)
 }
 

sulis_editor/Cargo.toml

@@ -4,6 +4,9 @@ version = "1.0.0"
 authors = ["Jared Stephen <grok_moo@yahoo.com>"]
 edition = "2021"
 
+[lints]
+workspace = true
+
 [dependencies]
 sulis_core = { path = "../sulis_core" }
 sulis_module = { path = "../sulis_module" }

sulis_editor/src/lib.rs

@@ -14,9 +14,6 @@
 //  You should have received a copy of the GNU General Public License
 //  along with Sulis.  If not, see <http://www.gnu.org/licenses/>
 
-#![allow(clippy::type_complexity)]
-#![allow(clippy::manual_range_contains)]
-
 mod actor_picker;
 use crate::actor_picker::ActorPicker;
 

sulis_module/Cargo.toml

@@ -4,6 +4,9 @@ version = "1.0.0"
 authors = ["Jared Stephen <grok_moo@yahoo.com>"]
 edition = "2021"
 
+[lints]
+workspace = true
+
 [dependencies]
 sulis_core = { path = "../sulis_core" }
 

sulis_module/src/generator/encounter_gen.rs

@@ -154,7 +154,6 @@ impl EncounterParams {
         module: &Module,
     ) -> Result<EncounterParams, Error> {
         EncounterParams::build(builder, |id| {
-            #[allow(clippy::map_clone)]
             module.encounters.get(id).map(Rc::clone)
         })
     }

sulis_module/src/lib.rs

@@ -14,9 +14,6 @@
 //  You should have received a copy of the GNU General Public License
 //  along with Sulis.  If not, see <http://www.gnu.org/licenses/>
 
-#![allow(clippy::manual_range_contains)]
-#![allow(clippy::map_clone)]
-
 #[macro_use]
 extern crate log;
 

sulis_module/src/loot_list.rs

@@ -142,7 +142,7 @@ impl LootList {
         id: String,
         entry_in: EntryBuilder,
     ) -> Result<Entry, Error> {
-        if module.items.get(&id).is_none() {
+        if !module.items.contains_key(&id) {
             warn!("Unable to find item '{}'", id);
             return unable_to_create_error("loot_list", builder_id);
         }
@@ -159,7 +159,7 @@ impl LootList {
             if id == "none" {
                 continue;
             }
-            if module.item_adjectives.get(&id).is_none() {
+            if !module.item_adjectives.contains_key(&id) {
                 warn!("Unable to find item adjective '{}'", id);
                 return unable_to_create_error("loot_list", builder_id);
             }
@@ -173,7 +173,7 @@ impl LootList {
             if id == "none" {
                 continue;
             }
-            if module.item_adjectives.get(&id).is_none() {
+            if !module.item_adjectives.contains_key(&id) {
                 warn!("Unable to find item adjective '{}'", id);
                 return unable_to_create_error("loot_list", builder_id);
             }

sulis_state/Cargo.toml

@@ -4,6 +4,9 @@ version = "1.0.0"
 authors = ["Jared Stephen <grok_moo@yahoo.com>"]
 edition = "2021"
 
+[lints]
+workspace = true
+
 [dependencies]
 sulis_core = { path = "../sulis_core" }
 sulis_module = { path = "../sulis_module" }

sulis_state/src/game_state.rs

@@ -924,7 +924,6 @@ impl GameState {
     }
 
     pub fn get_area_state(id: &str) -> Option<Rc<RefCell<AreaState>>> {
-        #[allow(clippy::map_clone)]
         STATE.with(|s| s.borrow().as_ref().unwrap().areas.get(id).map(Rc::clone))
     }
 

sulis_state/src/inventory.rs

@@ -374,13 +374,13 @@ impl Inventory {
         if to_remove_primary.is_some() {
             primary_count += 1;
         }
-        if self.equipped.get(&slot).is_some() {
+        if self.equipped.contains_key(&slot) {
             primary_count += 1;
         }
         if to_remove_alt.is_some() {
             alt_count += 1;
         }
-        if self.equipped.get(&alt_slot).is_some() {
+        if self.equipped.contains_key(&alt_slot) {
             alt_count += 1;
         }
 

sulis_state/src/lib.rs

@@ -14,9 +14,6 @@
 //  You should have received a copy of the GNU General Public License
 //  along with Sulis.  If not, see <http://www.gnu.org/licenses/>
 
-#![allow(clippy::type_complexity)]
-#![allow(clippy::map_clone)]
-
 #[macro_use]
 extern crate log;
 

sulis_state/src/los_calculator.rs

@@ -140,7 +140,6 @@ fn cast_ray(
     end_y: i32,
     src_elev: u8,
 ) -> bool {
-    #[allow(clippy::collapsible_else_if)] // this block is logically easier to read when not collapsed
     if (end_y - start_y).abs() < (end_x - start_x).abs() {
         if start_x > end_x {
             cast_low(

sulis_state/src/script/area_targeter.rs

@@ -428,7 +428,6 @@ impl Shape {
         points
     }
 
-    #[allow(clippy::collapsible_if)]
     fn get_points_line_internal(
         &self,
         start: Point,
@@ -445,7 +444,6 @@ impl Shape {
             Some(size) => size,
         };
 
-        #[allow(clippy::collapsible_else_if)] // this block is logically easier to read when not collapsed
         let (points, concat) = if (end.y - start.y).abs() < (end.x - start.x).abs() {
             if start.x > end.x {
                 let mut p = cast_low(end, start);

sulis_state/src/script/script_callback.rs

@@ -533,7 +533,7 @@ impl CallbackData {
     }
 
     fn exec_surface_script(&self, kind: FuncKind, target: Option<usize>) {
-        if self.funcs.get(&kind).is_none() {
+        if !self.funcs.contains_key(&kind) {
             return;
         }
 
@@ -611,7 +611,7 @@ impl ScriptCallback for CallbackData {
     fn on_exited_surface(&self, target: usize) {
         // since it is called after the surface has been removed in some cases
         // we cannot preserve the surface info for on_exited_surface scripts
-        if self.funcs.get(&FuncKind::OnExitedSurface).is_none() {
+        if !self.funcs.contains_key(&FuncKind::OnExitedSurface) {
             return;
         }
 

sulis_state/src/script/script_entity.rs

@@ -1203,7 +1203,6 @@ impl UserData for ScriptEntity {
             Ok(())
         });
 
-        #[allow(clippy::type_complexity)]
         methods.add_method(
             "special_attack",
             |_,

sulis_view/Cargo.toml

@@ -4,6 +4,9 @@ version = "1.0.0"
 authors = ["Jared Stephen <grok_moo@yahoo.com>"]
 edition = "2021"
 
+[lints]
+workspace = true
+
 [dependencies]
 sulis_core = { path = "../sulis_core" }
 sulis_module = { path = "../sulis_module" }