chore: switch to matches macro

avhz · Nov 19, 2024 · 16a8bd7 · 16a8bd7
1 parent 94d96cd
commit 16a8bd7
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 31 deletions.
diff --git a/.github/workflows/cargo_build.yml b/.github/workflows/cargo_build.yml
@@ -25,4 +25,4 @@ jobs:
       # BUILD THE LIBRARY
       # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
       - name: Build RustQuant.
-        run: cargo build --release --verbose --all-features
+        run: cargo build --release --verbose --all-features --all-targets
diff --git a/.github/workflows/cargo_test_doctests.yml b/.github/workflows/cargo_test_doctests.yml
@@ -26,4 +26,4 @@ jobs:
       # TEST THE LIBRARY
       # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
       - name: Run doc tests.
-        run: cargo test --doc # --verbose
+        run: cargo test --doc --verbose --all-features --all-targets --no-fail-fast
diff --git a/.github/workflows/cargo_test_examples.yml b/.github/workflows/cargo_test_examples.yml
@@ -26,4 +26,4 @@ jobs:
       # TEST THE LIBRARY
       # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
       - name: Run examples.
-        run: cargo test --examples # --verbose
+        run: cargo test --examples --verbose --all-features --all-targets --no-fail-fast
diff --git a/.github/workflows/cargo_test_library.yml b/.github/workflows/cargo_test_library.yml
@@ -26,4 +26,4 @@ jobs:
       # TEST THE LIBRARY
       # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
       - name: Run unit tests.
-        run: cargo test --lib # --verbose
+        run: cargo test --lib --verbose --all-features --all-targets --no-fail-fast
diff --git a/Cargo.toml b/Cargo.toml
@@ -85,6 +85,7 @@ argmin-math = "0.4.0"       # https://docs.rs/argmin-math/latest/argmin_math/
 derive_builder = "0.20.0"   # https://docs.rs/derive_builder/latest/derive_builder/
 errorfunctions = "0.2.0"    # https://docs.rs/errorfunctions/latest/errorfunctions/
 finitediff = "0.1.4"        # https://docs.rs/finitediff/latest/finitediff/
+icu = "1.5.0"               # https://docs.rs/icu/latest/icu/
 nalgebra = "0.33.0"         # https://docs.rs/nalgebra/latest/nalgebra/
 ndrustfft = "0.5.0"         # https://docs.rs/ndrustfft/latest/ndrustfft/
 ndarray-rand = "0.15.0"     # https://docs.rs/ndarray-rand/latest/ndarray_rand/

diff --git a/crates/RustQuant_time/Cargo.toml b/crates/RustQuant_time/Cargo.toml
@@ -20,8 +20,8 @@ RustQuant = { path = "../RustQuant" }
 [dependencies]
 RustQuant_iso = { workspace = true }
 RustQuant_utils = { workspace = true }
-icu = "1.5.0"
-serde.workspace = true
+icu = { workspace = true }
+serde = { workspace = true }
 time = { workspace = true }
 
 ## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

diff --git a/crates/RustQuant_time/src/countries/middle_east/israel.rs b/crates/RustQuant_time/src/countries/middle_east/israel.rs
@@ -7,16 +7,10 @@
 //      - LICENSE-MIT.md
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// IMPORTS
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-use time::{Date, Weekday};
-
-use icu;
-
 use crate::calendar::Calendar;
 use crate::utilities::unpack_date;
+use icu;
+use time::{Date, Weekday};
 use RustQuant_iso::*;
 
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -46,7 +40,7 @@ const JEWISH_HOLIDAYS: [(u8, u8); 16] = [
 // STRUCTS, ENUMS, TRAITS
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-/// Israel a national holiday calendar.
+/// Israel national holiday calendar.
 pub struct IsraelCalendar;
 
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -93,22 +87,22 @@ impl Calendar for IsraelCalendar {
             hebrew_month -= 1;
         }
 
-        let is_independence_or_memorial_day = match &(hebrew_month, hebrew_day, wd) {
-            (8, 3..=4, Weekday::Thursday) => true,
-            (8, 2..=3, Weekday::Wednesday) => true,
-            (8, 5, Weekday::Monday) => true,
-            (8, 6, Weekday::Tuesday) => true,
-            (8, 5, Weekday::Wednesday) => true,
-            (8, 4, Weekday::Tuesday) => true,
-            _ => false,
-        };
-
-        let is_tisha_beav = match &(hebrew_month, hebrew_day, wd) {
-            (11, 10, Weekday::Sunday) => true,
-            (11, 9, Weekday::Saturday) => false,
-            (11, 9, _) => true,
-            _ => false,
-        };
+        // Check if the date is Independence Day or Memorial Day.
+        let is_independence_or_memorial_day = matches!(
+            &(hebrew_month, hebrew_day, wd),
+            (8, 3..=4, Weekday::Thursday)
+                | (8, 2..=3, Weekday::Wednesday)
+                | (8, 5, Weekday::Monday)
+                | (8, 6, Weekday::Tuesday)
+                | (8, 5, Weekday::Wednesday)
+                | (8, 4, Weekday::Tuesday)
+        );
+
+        // Check if the date is Tisha Beav.
+        let is_tisha_beav = matches!(
+            &(hebrew_month, hebrew_day, wd),
+            (11, 10, Weekday::Sunday) | (11, 9, Weekday::Saturday) | (11, 9, _)
+        );
 
         JEWISH_HOLIDAYS.contains(&(hebrew_month, hebrew_day))
             || is_independence_or_memorial_day