Merge remote-tracking branch 'origin/main' into james/impl-clocks

1 files changed, 19 insertions, 8 deletions

diff --git a/src/rtc.rs b/src/rtc.rs
index d62da1f0a..facb9cf8c 100644
--- a/src/rtc.rs
+++ b/src/rtc.rs
@@ -102,25 +102,36 @@ pub fn convert_seconds_to_datetime(seconds: u32) -> RtcDateTime {
         days -= days_in_year;
         year += 1;
 
-        days_in_year = if year % 4 == 0 {
+        days_in_year = if year.is_multiple_of(4) {
             DAYS_IN_A_YEAR + 1
         } else {
             DAYS_IN_A_YEAR
         };
     }
 
-    let mut days_per_month = [0u8, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
-    if year % 4 == 0 {
-        days_per_month[2] = 29;
-    }
+    let days_per_month = [
+        31,
+        if year.is_multiple_of(4) { 29 } else { 28 },
+        31,
+        30,
+        31,
+        30,
+        31,
+        31,
+        30,
+        31,
+        30,
+        31,
+    ];
 
     let mut month = 1;
-    for m in 1..=12 {
-        if days <= days_per_month[m] as u32 {
+    for (m, month_days) in days_per_month.iter().enumerate() {
+        let m = m + 1;
+        if days <= *month_days as u32 {
             month = m;
             break;
         } else {
-            days -= days_per_month[m] as u32;
+            days -= *month_days as u32;
         }
     }