eryn/chessfriend
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[position] Streamline the implementation of castling_{king,rook}

Browse source 
Instead of using .and_then with an if/else, use .filter and pass the predicate.
Saves a few lines.
This commit is contained in:
Eryn Wells 2025-05-21 08:26:34 -07:00
parent feaa81bbd8
commit 85c1a395c4
1 changed files with 6 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

20
position/src/position/castle.rs
View file

@ -69,23 +69,15 @@ impl Position {
} }
pub(crate) fn castling_king(&self, square: Square) -> Option<Piece> { pub(crate) fn castling_king(&self, square: Square) -> Option<Piece> {
self.get_piece(square).and_then(|piece| { let active_color = self.board.active_color;
if piece.color == self.board.active_color && piece.is_king() { self.get_piece(square)
Some(piece) .filter(|piece| piece.color == active_color && piece.is_king())
} else {
None
}
})
} }
pub(crate) fn castling_rook(&self, square: Square) -> Option<Piece> { pub(crate) fn castling_rook(&self, square: Square) -> Option<Piece> {
self.get_piece(square).and_then(|piece| { let active_color = self.board.active_color;
if piece.color == self.board.active_color && piece.is_rook() { self.get_piece(square)
Some(piece) .filter(|piece| piece.color == active_color && piece.is_rook())
} else {
None
}
})
} }
} }