From 6ced50128cb403ab5606d6e9b029869e94ac47fc Mon Sep 17 00:00:00 2001
From: kageru <kageru@encode.moe>
Date: Fri, 2 Dec 2022 15:07:19 +0100
Subject: [PATCH] optimize more

---
 2022/src/bin/day02.rs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/2022/src/bin/day02.rs b/2022/src/bin/day02.rs
index 1e9504c..4d4a73c 100644
--- a/2022/src/bin/day02.rs
+++ b/2022/src/bin/day02.rs
@@ -8,17 +8,17 @@ fn round([other, _, own, _]: [u8; 4]) -> usize {
     (match other.wrapping_sub(own - b'X' + b'A') {
         0 => 3 + own - b'W',
         1 | 254 => 0 + own - b'W',
-        2 | 255 => 6 + own - b'W',
-        _ => unreachable!(),
+        _ => 6 + own - b'W',
     }) as usize
 }
 
 fn round_p2([other, _, own, _]: [u8; 4]) -> usize {
-    (match own {
-        b'X' => other - b'A' + (3 * (other == b'A') as u8),
-        b'Y' => other - b'A' + 4,
-        b'Z' => other - b'A' + 8 - (3 * (other == b'C') as u8),
-        _ => unreachable!(),
+    (match (own, other) {
+        (b'Y', _) => other - b'A' + 4,
+        (b'X', b'A') => 3,
+        (b'X', _) => other - b'A',
+        (_, b'C') => 7,
+        _ => other - b'A' + 8,
     }) as usize
 }