Fix deserializing

src/game.rs

@@ -1,8 +1,9 @@
 pub use crate::{Player, Square};
 use anyhow::Result;
 pub use pleco::{BitMove, Board, File, Piece, PieceType, Player as PlecoPlayer, Rank, SQ};
+use serde::{Deserialize, Serialize};
 
-#[derive(Copy, Clone, Debug, PartialEq)]
+#[derive(Copy, Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub enum ChessOutcome {
     Checkmate { winner: Player },
     Stalemate,

src/proto.rs

@@ -37,9 +37,7 @@ impl ChessRequest {
         }
     }
 }
-
-//#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub enum ChessUpdate {
     /// Usually the Response to `ChessRequest::CurrentBoard`.
     /// But may be sent at other points to synchronize state as well.

src/square.rs

@@ -6,6 +6,9 @@ use serde_string_derive::SerdeDisplayFromStr;
 use std::fmt;
 use thiserror::Error;
 
+const FILES: &[char] = &['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H'];
+const RANKS: &[char] = &['1', '2', '3', '4', '5', '6', '7', '8'];
+
 #[derive(Error, Debug)]
 pub enum SquareFormatError {
     #[error("The square in not within the acceptable range (found: {found}, expected: between A1 and H8)")]
@@ -53,11 +56,11 @@ impl Square {
     }
 
     pub fn x(&self) -> u8 {
-        self.file() as u8
+        self.sq.file() as u8
     }
 
     pub fn y(&self) -> u8 {
-        self.rank() as u8
+        self.sq.rank() as u8
     }
 }
 
@@ -77,9 +80,6 @@ impl std::str::FromStr for Square {
     type Err = SquareFormatError;
 
     fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
-        const FILES: &[char] = &['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H'];
-        const RANKS: &[char] = &['1', '2', '3', '4', '5', '6', '7', '8'];
-
         let chars: Vec<_> = s.chars().collect();
         if (chars.len() != 2) {
             return Err(SquareFormatError::InvalidLength {
@@ -109,6 +109,17 @@ impl std::str::FromStr for Square {
     }
 }
 
+impl fmt::Display for Square {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(
+            f,
+            "{}{}",
+            FILES[self.x() as usize],
+            RANKS[self.y() as usize]
+        )
+    }
+}
+
 impl std::ops::Deref for Square {
     type Target = SQ;