]> git.seodisparate.com - EN605.607.81.SP22_ASDM_Project/commitdiff
Minor refactoring
authorStephen Seo <seo.disparate@gmail.com>
Mon, 7 Mar 2022 04:14:57 +0000 (13:14 +0900)
committerStephen Seo <seo.disparate@gmail.com>
Mon, 7 Mar 2022 04:14:57 +0000 (13:14 +0900)
Use "From<>" instead of "Into<>" for MainMenuMessage to GameState.

front_end/src/state.rs
front_end/src/yew_components.rs

index 6bb693b7ec99e34430c5e17f4a1900107a966d0d..8b8e2cc98ed18e50f7a08758b774ebb0a0449df4 100644 (file)
@@ -1,3 +1,4 @@
+use crate::yew_components::MainMenuMessage;
 use std::cell::Cell;
 use std::fmt::Display;
 use std::rc::Rc;
@@ -17,6 +18,16 @@ impl Default for GameState {
     }
 }
 
+impl From<MainMenuMessage> for GameState {
+    fn from(msg: MainMenuMessage) -> Self {
+        match msg {
+            MainMenuMessage::SinglePlayer => GameState::SinglePlayer,
+            MainMenuMessage::LocalMultiplayer => GameState::LocalMultiplayer,
+            MainMenuMessage::NetworkedMultiplayer => GameState::NetworkedMultiplayer,
+        }
+    }
+}
+
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
 pub enum BoardState {
     Empty,
index 8f92889bf8f1b353ce16ae29cc745de413b9b7db..56f6e84fb43e0fcac691e1b75861bec2f27d236c 100644 (file)
@@ -12,17 +12,6 @@ pub enum MainMenuMessage {
     NetworkedMultiplayer,
 }
 
-#[allow(clippy::from_over_into)]
-impl Into<GameState> for MainMenuMessage {
-    fn into(self) -> GameState {
-        match self {
-            MainMenuMessage::SinglePlayer => GameState::SinglePlayer,
-            MainMenuMessage::LocalMultiplayer => GameState::LocalMultiplayer,
-            MainMenuMessage::NetworkedMultiplayer => GameState::NetworkedMultiplayer,
-        }
-    }
-}
-
 impl Component for MainMenu {
     type Message = MainMenuMessage;
     type Properties = ();