From: MA Beaudet <ma@beaudet.xyz>
Date: Sun, 7 Nov 2021 19:46:30 +0000 (+0100)
Subject: fix: remove unnecessary try_from conversions from Card to u32
X-Git-Url: https://git.beaudet.xyz/?a=commitdiff_plain;h=0e03501c0cf0ac63b7cae3742df90d38510b39bf;p=poker-eval.git

fix: remove unnecessary try_from conversions from Card to u32
---

diff --git a/src/lib.rs b/src/lib.rs
index c5e5543..6a72610 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -218,10 +218,7 @@ impl Cards {
             for (j, prime) in PRIMES.iter().enumerate() {
                 let prime = *prime as u32;
                 deck.push(
-                    Card::try_from(
-                        prime | (u32::try_from(j).unwrap() << 8) | suit | (1 << (16 + j)),
-                    )
-                    .unwrap(),
+                    Card::try_from(prime | ((j as u32) << 8) | suit | (1 << (16 + j))).unwrap(),
                 );
             }
             suit >>= 1;
@@ -403,7 +400,7 @@ impl FromStr for Card {
                     (None, Some(_)) => Err(MyError::InvalidRank),
                     (Some(_), None) => Err(MyError::InvalidSuit),
                     (Some(r), Some(s)) => Ok(Self(
-                        PRIMES[r] as u32 | (u32::try_from(r).unwrap() << 8) | s | (1 << (16 + r)),
+                        PRIMES[r as usize] as u32 | (r << 8) | s | (1 << (16 + r)),
                     )),
                 }
             }