From 8c7b200b4b09ba8fac5b6bbe28c746018af887fc Mon Sep 17 00:00:00 2001
From: Jared Stephen <grok_moo@yahoo.com>
Date: Mon, 17 Jul 2023 14:56:47 -0700
Subject: [PATCH] fix warnings

---
 sulis_core/src/ui/layout_kind.rs |  9 ++----
 sulis_core/src/ui/theme.rs       | 47 ++++++++------------------------
 sulis_module/src/lib.rs          |  2 +-
 sulis_module/src/rules/bonus.rs  |  9 ++----
 4 files changed, 16 insertions(+), 51 deletions(-)

diff --git a/sulis_core/src/ui/layout_kind.rs b/sulis_core/src/ui/layout_kind.rs
index 1823e834..49cde270 100644
--- a/sulis_core/src/ui/layout_kind.rs
+++ b/sulis_core/src/ui/layout_kind.rs
@@ -21,8 +21,9 @@ use crate::config::Config;
 use crate::ui::theme::Theme;
 use crate::ui::{Cursor, Size, Widget};
 
-#[derive(Deserialize, Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Deserialize, Default, Debug, Clone, Copy, PartialEq, Eq)]
 pub enum LayoutKind {
+    #[default]
     Normal,
     BoxVertical,
     BoxHorizontal,
@@ -30,12 +31,6 @@ pub enum LayoutKind {
     GridColumns,
 }
 
-impl Default for LayoutKind {
-    fn default() -> Self {
-        LayoutKind::Normal
-    }
-}
-
 impl LayoutKind {
     pub fn layout(self, widget: &Widget) {
         let theme = Rc::clone(&widget.theme);
diff --git a/sulis_core/src/ui/theme.rs b/sulis_core/src/ui/theme.rs
index a8234685..9faa13b5 100644
--- a/sulis_core/src/ui/theme.rs
+++ b/sulis_core/src/ui/theme.rs
@@ -25,37 +25,28 @@ use crate::ui::color::Color;
 use crate::ui::{Border, LayoutKind, WidgetState};
 use crate::util::{Point, Size};
 
-#[derive(Deserialize, Debug, Clone, Copy, Eq, Hash, PartialEq)]
+#[derive(Deserialize, Default, Debug, Clone, Copy, Eq, Hash, PartialEq)]
 #[serde(deny_unknown_fields)]
 pub enum HorizontalAlignment {
     Left,
+    #[default]
     Center,
     Right,
 }
 
-impl Default for HorizontalAlignment {
-    fn default() -> Self {
-        HorizontalAlignment::Center
-    }
-}
-
-#[derive(Deserialize, Debug, Clone, Copy, Eq, Hash, PartialEq)]
+#[derive(Deserialize, Default, Debug, Clone, Copy, Eq, Hash, PartialEq)]
 #[serde(deny_unknown_fields)]
 pub enum VerticalAlignment {
     Top,
+    #[default]
     Center,
     Bottom,
 }
 
-impl Default for VerticalAlignment {
-    fn default() -> Self {
-        VerticalAlignment::Center
-    }
-}
-
-#[derive(Deserialize, Debug, Clone, Copy, Eq, Hash, PartialEq)]
+#[derive(Deserialize, Default, Debug, Clone, Copy, Eq, Hash, PartialEq)]
 #[serde(deny_unknown_fields)]
 pub enum SizeRelative {
+    #[default]
     Zero,
     Max,
     ChildMax,
@@ -63,15 +54,10 @@ pub enum SizeRelative {
     Custom,
 }
 
-impl Default for SizeRelative {
-    fn default() -> Self {
-        SizeRelative::Zero
-    }
-}
-
-#[derive(Deserialize, Debug, Clone, Copy, Eq, Hash, PartialEq)]
+#[derive(Deserialize, Default, Debug, Clone, Copy, Eq, Hash, PartialEq)]
 #[serde(deny_unknown_fields)]
 pub enum PositionRelative {
+    #[default]
     Zero,
     Center,
     Max,
@@ -79,12 +65,6 @@ pub enum PositionRelative {
     Mouse,
 }
 
-impl Default for PositionRelative {
-    fn default() -> Self {
-        PositionRelative::Zero
-    }
-}
-
 #[derive(Debug, Clone, Copy)]
 pub struct Relative {
     pub x: PositionRelative,
@@ -128,20 +108,15 @@ impl Default for Relative {
 
 pub const DEFAULT_THEME_ID: &str = "default";
 
-#[derive(Deserialize, Debug, Copy, Clone)]
+#[derive(Deserialize, Default, Debug, Copy, Clone)]
 pub enum Kind {
+    #[default]
     Ref, // a reference to a widget that will be added in rust code, or
-    // simply used as a building block for another theme item
+         // simply used as a building block for another theme item
     Label,     // a widget showing static text - defined purely in the theme
     Container, // a widget holding other widgets - defined purely in the theme
 }
 
-impl Default for Kind {
-    fn default() -> Self {
-        Kind::Ref
-    }
-}
-
 #[derive(Debug)]
 pub struct Theme {
     pub id: String,
diff --git a/sulis_module/src/lib.rs b/sulis_module/src/lib.rs
index 0fb19ef6..a33584ad 100644
--- a/sulis_module/src/lib.rs
+++ b/sulis_module/src/lib.rs
@@ -901,7 +901,7 @@ fn expand_include_directives(scripts: &mut HashMap<String, String>) {
             });
         }
 
-        for mut expansion in &mut expansions {
+        for expansion in &mut expansions {
             let substr = &script[(expansion.start_index + include_len)..];
             let mut iter = substr.lines();
             let id = match iter.next() {
diff --git a/sulis_module/src/rules/bonus.rs b/sulis_module/src/rules/bonus.rs
index 455402c1..f6bbcab7 100644
--- a/sulis_module/src/rules/bonus.rs
+++ b/sulis_module/src/rules/bonus.rs
@@ -71,10 +71,11 @@ pub enum BonusKind {
     ClassStat { id: String, amount: i32 },
 }
 
-#[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Serialize, Deserialize, Default, Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
 #[serde(deny_unknown_fields)]
 pub enum Contingent {
     /// Bonuses that should always be applied
+    #[default]
     Always,
 
     /// Bonuses that should only be applied to the parent if they have the given
@@ -109,12 +110,6 @@ pub enum Contingent {
     Threatened,
 }
 
-impl Default for Contingent {
-    fn default() -> Contingent {
-        Contingent::Always
-    }
-}
-
 #[derive(Serialize, Deserialize, Debug, Clone, PartialOrd, PartialEq)]
 #[serde(deny_unknown_fields)]
 pub struct Bonus {