refactor

src/attacks.rs

@@ -1,5 +1,4 @@
 use super::bitboard::*;
-use super::color::*;
 use super::magics::*;
 use super::piece::*;
 use super::square::*;

src/bitboard.rs

@@ -1,11 +1,9 @@
-use std::fmt;
-use std::ops::*;
-
 use super::attacks;
-use super::color::*;
-use super::file::*;
+use super::piece::*;
 use super::square::*;
 use super::types::*;
+use std::fmt;
+use std::ops::*;
 
 #[derive(Clone, Copy, Default, PartialEq, Eq)]
 pub struct Bitboard(pub Hash);

src/board.rs

@@ -1,12 +1,9 @@
 use super::attacks;
 use super::bitboard::*;
-use super::color::*;
-use super::file::*;
 use super::moov::*;
 use super::move_list::*;
 use super::nnue::*;
 use super::piece::*;
-use super::rank::*;
 use super::square::*;
 use super::types::*;
 use super::zobrist::*;

src/magics.rs

@@ -1,7 +1,5 @@
 use super::attacks::*;
 use super::bitboard::*;
-use super::file::*;
-use super::rank::*;
 use super::square::*;
 
 // Fancy magic bitboard implementation inspired by Rustfish's port of Stockfish

src/main.rs

@@ -11,9 +11,6 @@ use crate::uci::*;
 mod bitboard;
 mod attacks;
 mod board;
-mod color;
-mod diagonal;
-mod file;
 mod magics;
 mod moov;
 mod move_list;
@@ -22,7 +19,6 @@ mod nnue;
 mod nnue_weights;
 mod perft;
 mod piece;
-mod rank;
 mod search;
 mod search_master;
 mod square;

src/move_sorter.rs

@@ -1,7 +1,6 @@
 use super::attacks;
 use super::bitboard::*;
 use super::board::*;
-use super::color::*;
 use super::moov::*;
 use super::move_list::*;
 use super::piece::*;

src/piece.rs

@@ -1,9 +1,10 @@
+use super::types::*;
 use std::convert::TryFrom;
 use std::fmt;
-
-use super::color::*;
+use std::ops::Not;
 
 #[derive(Copy, Clone, PartialEq, PartialOrd, Eq, Debug)]
+#[repr(u8)]
 pub enum Piece {
     WhitePawn = 0b0000,
     WhiteKnight = 0b0001,
@@ -130,3 +131,66 @@ impl PieceType {
     pub const N_PIECE_TYPES: usize = 6;
     pub const PIECE_TYPE_STR: &'static str = "pnbrqk";
 }
+
+#[derive(Copy, Clone, Debug, PartialEq, Eq)]
+#[repr(u8)]
+pub enum Color {
+    White,
+    Black,
+}
+
+impl Color {
+    pub fn index(self) -> usize {
+        self as usize
+    }
+
+    pub fn factor(&self) -> Value {
+        match *self {
+            Self::White => 1,
+            Self::Black => -1,
+        }
+    }
+}
+
+impl From<u8> for Color {
+    fn from(n: u8) -> Self {
+        unsafe { std::mem::transmute::<u8, Self>(n) }
+    }
+}
+
+impl Not for Color {
+    type Output = Color;
+
+    fn not(self) -> Self {
+        Color::from((self as u8) ^ 1)
+    }
+}
+
+impl fmt::Display for Color {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(
+            f,
+            "{}",
+            match *self {
+                Self::White => "w",
+                Self::Black => "b",
+            }
+        )
+    }
+}
+
+impl TryFrom<char> for Color {
+    type Error = &'static str;
+
+    fn try_from(value: char) -> Result<Self, Self::Error> {
+        match value {
+            'w' => Ok(Self::White),
+            'b' => Ok(Self::Black),
+            _ => Err("Color must be either 'w' or 'b'."),
+        }
+    }
+}
+
+impl Color {
+    pub const N_COLORS: usize = 2;
+}