diff --git a/src/card/default.rs b/src/card/default.rs index 6b4a519..9a0fdd3 100644 --- a/src/card/default.rs +++ b/src/card/default.rs @@ -1,17 +1,5 @@ use crate::card::{Card, PlayingCard, Rank, Suit}; -impl Default for Rank { - fn default() -> Self { - Self::Three - } -} - -impl Default for Suit { - fn default() -> Self { - Self::Diamond - } -} - impl Default for PlayingCard { fn default() -> Self { Self::new(0, Rank::default(), Suit::default()) diff --git a/src/card/mod.rs b/src/card/mod.rs index 4778d82..369bb0f 100644 --- a/src/card/mod.rs +++ b/src/card/mod.rs @@ -8,8 +8,9 @@ mod ord; #[cfg(test)] mod tests; -#[derive(PartialEq, Eq, PartialOrd, Ord, Debug, Copy, Clone)] +#[derive(PartialEq, Eq, PartialOrd, Ord, Default, Debug, Copy, Clone)] pub enum Rank { + #[default] Three = 0, Four, Five, @@ -25,8 +26,9 @@ pub enum Rank { Two, } -#[derive(PartialEq, Eq, PartialOrd, Ord, Debug, Copy, Clone)] +#[derive(PartialEq, Eq, PartialOrd, Ord, Default, Debug, Copy, Clone)] pub enum Suit { + #[default] Diamond = 0, Club, Heart,