oreodave/big-c
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

card: make Card::PlayingCard variant struct-like for more clarity.

Browse Source
This commit is contained in:
Aryadev Chavali
2026-03-31 23:16:27 +01:00
committed by oreodave
parent 7009d14965
commit dfc5761246
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/card.rs
View File

@@ -30,12 +30,12 @@ pub enum Suit {
#[derive(Debug, Clone, Copy)] #[derive(Debug, Clone, Copy)]
pub enum Card { pub enum Card {
Joker(i64), Joker(i64),
PlayingCard(i64, Rank, Suit), PlayingCard { deck: i64, rank: Rank, suit: Suit },
} }
impl Card { impl Card {
fn is_joker(&self) -> bool { pub fn is_joker(&self) -> bool {
matches!(self, Card::Joker(_)) matches!(self, Self::Joker(_))
} }
} }
@@ -98,7 +98,7 @@ mod impls {
// Suit::try_from will always succeed // Suit::try_from will always succeed
let rank = Rank::try_from(n / 4).unwrap(); let rank = Rank::try_from(n / 4).unwrap();
let suit = Suit::try_from(n % 4).unwrap(); let suit = Suit::try_from(n % 4).unwrap();
Card::PlayingCard(deck, rank, suit) Card::PlayingCard { deck, rank, suit }
} }
} }
} }
@@ -107,7 +107,7 @@ mod impls {
fn from(card: Card) -> i64 { fn from(card: Card) -> i64 {
match card { match card {
Card::Joker(x) => x, Card::Joker(x) => x,
Card::PlayingCard(deck, rank, suit) => { Card::PlayingCard { deck, rank, suit } => {
(deck * 52) + ((rank as i64) * 4) + (suit as i64) (deck * 52) + ((rank as i64) * 4) + (suit as i64)
} }
} }