diff --git a/src/logic/board.rs b/src/logic/board/board.rs similarity index 99% rename from src/logic/board.rs rename to src/logic/board/board.rs index a83e77d..45062d5 100644 --- a/src/logic/board.rs +++ b/src/logic/board/board.rs @@ -1,14 +1,13 @@ use crate::logic::{ - field::Field, + board::{ + field::Field, + pawn::{CapturePath, Pawn, PawnState}, + }, math::{position::Position, vector::Vector2D}, - pawn::{CapturePath, Pawn, PawnState}, player::Player, }; -use std::{ - backtrace::BacktraceStatus::Captured, - ops::{Index, IndexMut}, -}; +use std::ops::{Index, IndexMut}; use log::{debug, info, warn}; @@ -463,7 +462,6 @@ impl IndexMut for Board { #[cfg(test)] mod tests { - use crate::logic::pawn::PawnState; use super::*; diff --git a/src/logic/field.rs b/src/logic/board/field.rs similarity index 89% rename from src/logic/field.rs rename to src/logic/board/field.rs index db7c18d..592bfe4 100644 --- a/src/logic/field.rs +++ b/src/logic/board/field.rs @@ -1,6 +1,6 @@ use std::fmt; -use crate::logic::{math::position::Position, pawn::Pawn}; +use crate::logic::{board::pawn::Pawn, math::position::Position}; #[derive(Debug, PartialEq, Eq)] pub struct Field { diff --git a/src/logic/board/mod.rs b/src/logic/board/mod.rs new file mode 100644 index 0000000..fb0a2bd --- /dev/null +++ b/src/logic/board/mod.rs @@ -0,0 +1,3 @@ +pub mod board; +mod field; +mod pawn; diff --git a/src/logic/pawn.rs b/src/logic/board/pawn.rs similarity index 100% rename from src/logic/pawn.rs rename to src/logic/board/pawn.rs diff --git a/src/logic/mod.rs b/src/logic/mod.rs index 4dae036..f9d8953 100644 --- a/src/logic/mod.rs +++ b/src/logic/mod.rs @@ -1,5 +1,3 @@ -mod board; -mod field; +pub mod board; mod math; -mod pawn; mod player;