From e49f9799fbce40a3266a04e36670a04990aea7a1 Mon Sep 17 00:00:00 2001 From: Kjetil Orbekk Date: Mon, 5 Sep 2022 15:37:51 -0400 Subject: Fix suit sort order --- webapp/src/card.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'webapp') 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: 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, ); -- cgit v1.2.3