From 2da853f1e874f941f7c3bd9b1926cd5bf858bf96 Mon Sep 17 00:00:00 2001 From: Rak Laptudirm Date: Thu, 26 Dec 2024 23:20:33 +0530 Subject: [PATCH] chore: more macro hygiene --- games/src/ataxx/mod.rs | 4 +--- games/src/chess/mod.rs | 4 ++-- games/src/interface/mod.rs | 8 ++++---- games/src/isolation/mod.rs | 4 +--- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/games/src/ataxx/mod.rs b/games/src/ataxx/mod.rs index f6e1a12..04b093a 100644 --- a/games/src/ataxx/mod.rs +++ b/games/src/ataxx/mod.rs @@ -13,9 +13,7 @@ mod position; #[cfg(test)] mod tests; -use crate::interface::game_details; - -game_details!( +crate::interface::game_details!( @bitboard_less Files: A, B, C, D, E, F, G; Ranks: 1 First, 2 Second, 3 Third, 4 Fourth, 5 Fifth, 6 Sixth, 7 Seventh; diff --git a/games/src/chess/mod.rs b/games/src/chess/mod.rs index eb32404..6799caa 100644 --- a/games/src/chess/mod.rs +++ b/games/src/chess/mod.rs @@ -22,9 +22,9 @@ mod tests; use std::ops; -use crate::interface::{game_details, RepresentableType, SquareType}; +use crate::interface::{RepresentableType, SquareType}; -game_details!( +crate::interface::game_details!( @bitboard_less Files: A, B, C, D, E, F, G, H; Ranks: 1 First, 2 Second, 3 Third, 4 Fourth, 5 Fifth, 6 Sixth, 7 Seventh, 8 Eighth; diff --git a/games/src/interface/mod.rs b/games/src/interface/mod.rs index 1274e9c..a639e07 100644 --- a/games/src/interface/mod.rs +++ b/games/src/interface/mod.rs @@ -107,14 +107,14 @@ macro_rules! game_details { $color_2:ident $color_2_repr:literal ($($piece_2_repr:literal),*); ) => { // Square types. - game_details!( + $crate::interface::game_details!( @squares Files: $($file_variant),* ; Ranks: $($rank_number $rank_variant),* ; ); // Piece types. - game_details!( + $crate::interface::game_details!( @pieces Pieces: $($piece_variant $piece_repr),*; $($other_variant $other_repr),*; @@ -133,7 +133,7 @@ macro_rules! game_details { Colors: $color_1:ident $color_1_repr:literal ($($piece_1_repr:literal),*), $color_2:ident $color_2_repr:literal ($($piece_2_repr:literal),*); ) => { - game_details!( + $crate::interface::game_details!( @color $color_1 $color_1_repr; $color_2 $color_2_repr; ); @@ -235,7 +235,7 @@ macro_rules! game_details { ) => { // The Square type's variants are the cartesian product of the variants // of its File and Rank types. - game_details!( + $crate::interface::game_details!( @file_rank_product $($rank_number),*;$($file_variant),* ); diff --git a/games/src/isolation/mod.rs b/games/src/isolation/mod.rs index 453509c..d2c4138 100644 --- a/games/src/isolation/mod.rs +++ b/games/src/isolation/mod.rs @@ -13,9 +13,7 @@ mod position; #[cfg(test)] mod tests; -use crate::interface::game_details; - -game_details!( +crate::interface::game_details!( @bitboard_less Files: A, B, C, D, E, F, G, H; Ranks: 1 First, 2 Second, 3 Third, 4 Fourth, 5 Fifth, 6 Sixth;