From bd435351924ebf5200311b33f5d7ad42c71f106c Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Sun, 24 Jul 2022 16:24:35 +0200
Subject: [PATCH] Move naive move generation into sub-module

---
 src/build.rs                       | 8 +++++---
 src/movegen/mod.rs                 | 8 ++------
 src/movegen/{ => naive}/bishop.rs  | 0
 src/movegen/{ => naive}/king.rs    | 0
 src/movegen/{ => naive}/knight.rs  | 0
 src/movegen/naive/mod.rs           | 5 +++++
 src/movegen/{ => naive}/pawn.rs    | 0
 src/movegen/{ => naive}/rook.rs    | 0
 src/movegen/wizardry/generation.rs | 3 +--
 src/movegen/wizardry/mask.rs       | 3 +--
 10 files changed, 14 insertions(+), 13 deletions(-)
 rename src/movegen/{ => naive}/bishop.rs (100%)
 rename src/movegen/{ => naive}/king.rs (100%)
 rename src/movegen/{ => naive}/knight.rs (100%)
 create mode 100644 src/movegen/naive/mod.rs
 rename src/movegen/{ => naive}/pawn.rs (100%)
 rename src/movegen/{ => naive}/rook.rs (100%)

diff --git a/src/build.rs b/src/build.rs
index 29721d1..e05410d 100644
--- a/src/build.rs
+++ b/src/build.rs
@@ -7,9 +7,11 @@ pub mod utils;
 use crate::{
     board::{Bitboard, Color, File, Square},
     movegen::{
-        king::king_moves,
-        knight::knight_moves,
-        pawn::{pawn_captures, pawn_moves},
+        naive::{
+            king::king_moves,
+            knight::knight_moves,
+            pawn::{pawn_captures, pawn_moves},
+        },
         wizardry::generation::{generate_bishop_magics, generate_rook_magics},
         Magic,
     },
diff --git a/src/movegen/mod.rs b/src/movegen/mod.rs
index 26b60a3..9ddbf36 100644
--- a/src/movegen/mod.rs
+++ b/src/movegen/mod.rs
@@ -2,12 +2,8 @@
 pub mod magic;
 pub use magic::*;
 
-// Move generation implementation details
-pub(crate) mod bishop;
-pub(crate) mod king;
-pub(crate) mod knight;
-pub(crate) mod pawn;
-pub(crate) mod rook;
+// Naive move generation
+pub mod naive;
 
 // Magic bitboard generation
 pub(crate) mod wizardry;
diff --git a/src/movegen/bishop.rs b/src/movegen/naive/bishop.rs
similarity index 100%
rename from src/movegen/bishop.rs
rename to src/movegen/naive/bishop.rs
diff --git a/src/movegen/king.rs b/src/movegen/naive/king.rs
similarity index 100%
rename from src/movegen/king.rs
rename to src/movegen/naive/king.rs
diff --git a/src/movegen/knight.rs b/src/movegen/naive/knight.rs
similarity index 100%
rename from src/movegen/knight.rs
rename to src/movegen/naive/knight.rs
diff --git a/src/movegen/naive/mod.rs b/src/movegen/naive/mod.rs
new file mode 100644
index 0000000..f1bbe3e
--- /dev/null
+++ b/src/movegen/naive/mod.rs
@@ -0,0 +1,5 @@
+pub mod bishop;
+pub mod king;
+pub mod knight;
+pub mod pawn;
+pub mod rook;
diff --git a/src/movegen/pawn.rs b/src/movegen/naive/pawn.rs
similarity index 100%
rename from src/movegen/pawn.rs
rename to src/movegen/naive/pawn.rs
diff --git a/src/movegen/rook.rs b/src/movegen/naive/rook.rs
similarity index 100%
rename from src/movegen/rook.rs
rename to src/movegen/naive/rook.rs
diff --git a/src/movegen/wizardry/generation.rs b/src/movegen/wizardry/generation.rs
index ee75d57..173eef0 100644
--- a/src/movegen/wizardry/generation.rs
+++ b/src/movegen/wizardry/generation.rs
@@ -1,6 +1,5 @@
 use crate::board::{Bitboard, Square};
-use crate::movegen::bishop::bishop_moves;
-use crate::movegen::rook::rook_moves;
+use crate::movegen::naive::{bishop::bishop_moves, rook::rook_moves};
 use crate::movegen::Magic;
 
 use super::mask::{generate_bishop_mask, generate_rook_mask};
diff --git a/src/movegen/wizardry/mask.rs b/src/movegen/wizardry/mask.rs
index 0c0bbdf..eed93a0 100644
--- a/src/movegen/wizardry/mask.rs
+++ b/src/movegen/wizardry/mask.rs
@@ -1,6 +1,5 @@
 use crate::board::{Bitboard, File, Rank, Square};
-use crate::movegen::bishop::bishop_moves;
-use crate::movegen::rook::rook_moves;
+use crate::movegen::naive::{bishop::bishop_moves, rook::rook_moves};
 
 pub fn generate_bishop_mask(square: Square) -> Bitboard {
     let rays = bishop_moves(square, Bitboard::EMPTY);