summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKjetil Orbekk <kj@orbekk.com>2022-09-05 15:37:51 -0400
committerKjetil Orbekk <kj@orbekk.com>2022-09-05 15:37:51 -0400
commite49f9799fbce40a3266a04e36670a04990aea7a1 (patch)
treefff5d479fe439529281a7118d4f49afe31747ecc
parent06aeab55c9ec91f8bfb8c3570297ee26f321bbf5 (diff)
Fix suit sort order
-rw-r--r--webapp/src/card.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/webapp/src/card.rs b/webapp/src/card.rs
index 825694f..6bb34eb 100644
--- a/webapp/src/card.rs
+++ b/webapp/src/card.rs
@@ -178,7 +178,7 @@ pub fn sort_cards<Suits: Iterator<Item = Suit>>(suits: Suits, ord: RankOrder, ca
if s1 == s2 {
r1.cmp(&r2)
} else {
- score[s2 as usize].cmp(&score[s1 as usize])
+ score[s1 as usize].cmp(&score[s2 as usize])
}
};
if ord == RankOrder::Descending {
@@ -218,7 +218,7 @@ mod tests {
assert_eq!([card("♠A"), card("♥A"), card("♣A"), card("♦A"),], {
let mut cards = [card("♣A"), card("♠A"), card("♥A"), card("♦A"),];
sort_cards(
- [Suit::Spade, Suit::Heart, Suit::Club, Suit::Diamond].into_iter(),
+ [Suit::Diamond, Suit::Club, Suit::Heart, Suit::Spade].into_iter(),
RankOrder::Descending,
&mut cards,
);