Incorrect 2023 day 7 part 2

But it passes the tests, so I might as well push it.

2023/src/day07.rs

@@ -5,7 +5,7 @@ use nom::combinator::map_res;
 use nom::multi::many1;
 use nom::sequence::pair;
 use nom::sequence::terminated;
-use nom::IResult;
+use nom::Parser;
 
 use crate::common::parse_input;
 
@@ -20,8 +20,7 @@ enum Kind {
     FiveOfAKind,
 }
 
-impl<'a> From<&'a [u8; 5]> for Kind {
+fn kind_parser1(cards: &[u8; 5]) -> Kind {
-    fn from(cards: &'a [u8; 5]) -> Self {
     let mut counts = [0u8; 15];
     for &card in cards {
         counts[card as usize] += 1;
@@ -38,6 +37,26 @@ impl<'a> From<&'a [u8; 5]> for Kind {
         _ => Kind::HighCard,
     }
 }
+
+fn kind_parser2(cards: &[u8; 5]) -> Kind {
+    let mut counts = [0u8; 15];
+    for &card in cards {
+        counts[card as usize] += 1;
+    }
+
+    let jokers = counts[11];
+    counts[11] = 0;
+
+    counts.sort_unstable();
+    match (counts[14] + jokers, counts[13]) {
+        (5, _) => Kind::FiveOfAKind,
+        (4, _) => Kind::FourOfAKind,
+        (3, 2) => Kind::FullHouse,
+        (3, _) => Kind::ThreeOfAKind,
+        (2, 2) => Kind::TwoPair,
+        (2, _) => Kind::Pair,
+        _ => Kind::HighCard,
+    }
 }
 
 struct Hand {
@@ -46,7 +65,9 @@ struct Hand {
     kind: Kind,
 }
 
-fn parse_hands(i: &[u8]) -> IResult<&[u8], Vec<Hand>> {
+fn hands_parser<'a>(
+    kind_parser: impl Fn(&[u8; 5]) -> Kind,
+) -> impl Parser<&'a [u8], Vec<Hand>, nom::error::Error<&'a [u8]>> {
     fn map_card(c: u8) -> anyhow::Result<u8> {
         Ok(match c {
             d @ b'2'..=b'9' => d - b'0',
@@ -64,21 +85,19 @@ fn parse_hands(i: &[u8]) -> IResult<&[u8], Vec<Hand>> {
             terminated(take(5usize), tag(" ")),
             terminated(nom::character::complete::u32, newline),
         ),
-        |(hand, bid)| -> anyhow::Result<Hand> {
+        move |(hand, bid)| -> anyhow::Result<Hand> {
             let mut cards = [0; 5];
             for (t, &s) in cards.iter_mut().zip(hand) {
                 *t = map_card(s)?
             }
-            let kind = Kind::from(&cards);
+            let kind = kind_parser(&cards);
 
             Ok(Hand { cards, bid, kind })
         },
-    ))(i)
+    ))
 }
 
-pub fn part1(input: &[u8]) -> anyhow::Result<String> {
+fn parts_common(hands: &mut [Hand]) -> anyhow::Result<String> {
-    let mut hands = parse_input(input, parse_hands)?;
-
     hands.sort_unstable_by(|first, second| {
         first
             .kind
@@ -95,8 +114,17 @@ pub fn part1(input: &[u8]) -> anyhow::Result<String> {
     Ok(sum.to_string())
 }
 
-pub fn part2(_input: &[u8]) -> anyhow::Result<String> {
+pub fn part1(input: &[u8]) -> anyhow::Result<String> {
-    anyhow::bail!("Not implemented")
+    let mut hands = parse_input(input, hands_parser(kind_parser1))?;
+
+    parts_common(&mut hands)
+}
+
+// Too high: 248859461
+pub fn part2(input: &[u8]) -> anyhow::Result<String> {
+    let mut hands = parse_input(input, hands_parser(kind_parser2))?;
+
+    parts_common(&mut hands)
 }
 
 #[cfg(test)]
@@ -109,4 +137,9 @@ mod tests {
     fn sample_part1() {
         assert_eq!(part1(SAMPLE).unwrap(), "6440");
     }
+
+    #[test]
+    fn sample_part2() {
+        assert_eq!(part2(SAMPLE).unwrap(), "5905");
+    }
 }

2023/src/samples/07.txt

@@ -0,0 +1,5 @@
+32T3K 765
+T55J5 684
+KK677 28
+KTJJT 220
+QQQJA 483