From 69c012e47a2d22d0e47561904a2230f6d1fa202d Mon Sep 17 00:00:00 2001 From: Aryadev Chavali Date: Thu, 2 Apr 2026 02:25:48 +0100 Subject: [PATCH] *: young clippy back at it again --- src/card.rs | 6 +++--- src/classifier.rs | 3 +-- src/main.rs | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/card.rs b/src/card.rs index 8af2e68..3d99095 100644 --- a/src/card.rs +++ b/src/card.rs @@ -78,11 +78,11 @@ impl Card { } pub fn rank(&self) -> Option { - self.playing_card().and_then(|pc| Some(pc.rank)) + self.playing_card().map(|pc| pc.rank) } pub fn suit(&self) -> Option { - self.playing_card().and_then(|pc| Some(pc.suit)) + self.playing_card().map(|pc| pc.suit) } } @@ -226,7 +226,7 @@ mod traits_numerics { impl From for i64 { fn from(card: PlayingCard) -> i64 { - let deck = card.deck as i64; + let deck = card.deck; let rank = card.rank as i64; let suit = card.suit as i64; (deck * 52) + (rank * 4) + suit diff --git a/src/classifier.rs b/src/classifier.rs index 97f29a4..8f4c51a 100644 --- a/src/classifier.rs +++ b/src/classifier.rs @@ -93,8 +93,7 @@ fn try_poker_hand(num_jokers: usize, cards: &[Card]) -> Option { let (highest_rank_freq, num_pairs) = { let mut highest_rank_freq = 0; let mut num_pairs = 0; - for i in 0..counter_ranks.len() { - let rank_freq = counter_ranks[i]; + for rank_freq in counter_ranks { highest_rank_freq = std::cmp::max(rank_freq, highest_rank_freq); if rank_freq == 2 { num_pairs += 1 diff --git a/src/main.rs b/src/main.rs index 3bfca7e..3e51696 100644 --- a/src/main.rs +++ b/src/main.rs @@ -29,7 +29,7 @@ fn main() { } println!(); - let hand = classify(&hand); + let hand = classify(hand); match hand { Some(hand) => println!("{}", hand), None => println!("Not a hand"),