typing improvements

src/logic/future_moves.rs

@@ -1,6 +1,6 @@
 use crate::{
     logic::r#move::Move,
-    repr::{Board, CoordPair, Piece, Winner},
+    repr::{Board, Piece, Winner},
 };
 use allocative::Allocative;
 use indicatif::{ParallelProgressIterator, ProgressStyle};
@@ -15,6 +15,8 @@ use std::{
     },
 };
 
+use super::r#move::MoveCoord;
+
 #[derive(Allocative)]
 pub struct FutureMoves {
     /// Arena containing all [`Move`]
@@ -354,7 +356,7 @@ impl FutureMoves {
         }
     }
 
-    fn move_history(&self, idx: usize) -> Option<Vec<(Option<CoordPair>, Piece)>> {
+    fn move_history(&self, idx: usize) -> Option<Vec<(MoveCoord, Piece)>> {
         if let Some(root) = self.current_root {
             let mut hist = Vec::new();
 
@@ -395,7 +397,7 @@ impl FutureMoves {
     }
 
     /// Return the best move which is a child of `self.current_root`
-    pub fn best_move(&self) -> Option<Option<CoordPair>> {
+    pub fn best_move(&self) -> Option<MoveCoord> {
         self.current_root
             .and_then(|x| {
                 self.arena[x]