replaced snip files

Author: folkengine

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "ckc-rs"
 description = "Poker hand evaluation library"
-version = "0.1.16"
+version = "0.1.17"
 authors = ["electronicpanopticon <[email protected]>"]
 repository = "https://github.com/ImperialBower/ckc-rs.git"
 homepage = "https://github.com/ImperialBower/ckc-rs"
@@ -13,10 +13,8 @@ exclude = [".github/workflows/*", ".gitignore", "Cargo.lock"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-log = { version = "0.4.21", default-features = false }
-serde = { version = "1.0.197", default-features = false, features = ["derive"] }
-strum = { version = "0.26.2", features = ["derive"] }
+serde = { version = "1.0.219", default-features = false, features = ["derive"] }
+strum = { version = "0.27.1", features = ["derive"] }
 
 [dev-dependencies]
-cardpack = "0.5.1"
-rstest = "0.18.2"
+rstest = "0.25.0"

src/cards/five.rs

@@ -90,7 +90,7 @@ impl Five {
         while low <= high {
             mid = (high + low) >> 1; // divide by two
 
-            let product = crate::lookups::PRODUCTS[mid] as usize;
+            let product = crate::lookups::products::PRODUCTS[mid] as usize;
             if key < product {
                 high = mid - 1;
             } else if key > product {
@@ -103,15 +103,15 @@ impl Five {
     }
 
     fn not_unique(&self) -> HandRankValue {
-        crate::lookups::VALUES[Five::find_in_products(self.multiply_primes())]
+        crate::lookups::values::VALUES[Five::find_in_products(self.multiply_primes())]
     }
 
     #[allow(clippy::cast_possible_truncation)]
     fn unique(index: usize) -> HandRankValue {
         if index > Five::POSSIBLE_COMBINATIONS {
             return CardNumber::BLANK as HandRankValue;
         }
-        crate::lookups::UNIQUE_5[index]
+        crate::lookups::unique5::UNIQUE_5[index]
     }
 
     //endregion
@@ -179,7 +179,7 @@ impl HandRanker for Five {
         let i = self.or_rank_bits() as usize;
 
         let hrv: HandRankValue = if self.is_flush() {
-            crate::lookups::FLUSHES[i]
+            crate::lookups::flushes::FLUSHES[i]
         } else {
             // Continue to evaluate if it's not a flush and the cards aren't
             // unique (straight or high card).

src/cards/two.rs

@@ -148,11 +148,7 @@ impl Two {
     pub fn get_gap(&self) -> u8 {
         let s = self.sort();
         let distance_between = s.first().get_card_rank() as u8 - s.second().get_card_rank() as u8;
-        if distance_between < 1 {
-            0
-        } else {
-            distance_between - 1
-        }
+        distance_between.saturating_sub(1)
     }
 
     #[must_use]

src/lookups/examples.snip

@@ -30,13 +30,7 @@
 /// flushes and straight-flushes.  entries containing a zero
 /// mean that combination is not possible with a five-card
 /// flush hand.
-pub const FLUSHES: [u16; 7937] = include!("flushes.snip");
-
-/// this is a table lookup for all non-flush hands consisting
-/// of five unique ranks (i.e.  either Straights or High Card
-/// hands).  it's similar to the above "flushes" array.
-pub const UNIQUE_5: [u16; 7937] = include!("unique5.snip");
-
-/// those two arrays are needed for original evaluator version
-pub const PRODUCTS: [u32; 4888] = include!("products.snip");
-pub const VALUES: [u16; 4888] = include!("values.snip");
+pub mod flushes;
+pub mod products;
+pub mod unique5;
+pub mod values;