From a6f4b1d5c5b56d3ae28da9d9fa62ee8cdf362971 Mon Sep 17 00:00:00 2001
From: Deukhoofd <Deukhoofd@gmail.com>
Date: Fri, 21 Apr 2023 09:39:20 +0200
Subject: [PATCH] Minor fix, add unused_must_use as deny linter

---
 src/dynamic_data/models/battle.rs | 20 ++++++--------------
 src/lib.rs                        |  1 +
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/dynamic_data/models/battle.rs b/src/dynamic_data/models/battle.rs
index 5cfbab0..f248387 100755
--- a/src/dynamic_data/models/battle.rs
+++ b/src/dynamic_data/models/battle.rs
@@ -200,10 +200,8 @@ impl Battle {
         for (side_index, side) in self.sides.iter().enumerate() {
             // If any side has fled, the battle end.
             if side.has_fled_battle() {
-                let _w = self.result.write();
-                unsafe {
-                    self.result.data_ptr().replace(BattleResult::Inconclusive);
-                }
+                let mut w = self.result.write();
+                *w = BattleResult::Inconclusive;
                 self.has_ended.store(true, Ordering::SeqCst);
                 return Ok(());
             }
@@ -219,19 +217,13 @@ impl Battle {
         }
         // Everyone died :(
         if !surviving_side_exists {
-            let _w = self.result.write();
-            unsafe {
-                self.result.data_ptr().replace(BattleResult::Inconclusive);
-            }
+            let mut w = self.result.write();
+            *w = BattleResult::Inconclusive;
         }
         // Someone survived, they won!
         else {
-            let _w = self.result.write();
-            unsafe {
-                self.result.data_ptr().replace(BattleResult::Conclusive(
-                    winning_side.ok_or(anyhow!("Winning side was not set"))?,
-                ));
-            }
+            let mut w = self.result.write();
+            *w = BattleResult::Conclusive(winning_side.ok_or(anyhow!("Winning side was not set"))?);
         }
         self.has_ended.store(true, Ordering::SeqCst);
         Ok(())
diff --git a/src/lib.rs b/src/lib.rs
index 5dad32a..6a43893 100755
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -14,6 +14,7 @@
 #![deny(clippy::string_slice)]
 #![deny(clippy::exit)]
 #![deny(clippy::panic)]
+#![deny(unused_must_use)]
 // Features
 #![feature(test)]
 #![feature(const_option)]