Correctly order earliest / latest for Ambiguous times in local TimeZone.

Fix for #1625
chronotope · Nov 8, 2024 · bfa4196 · bfa4196
1 parent 868822e
commit bfa4196
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/offset/local/tz_info/rule.rs b/src/offset/local/tz_info/rule.rs
@@ -272,7 +272,7 @@ impl AlternateTime {
                     } else if local_time >= dst_end_transition_end
                         && local_time <= dst_end_transition_start
                     {
-                        Ok(crate::MappedLocalTime::Ambiguous(self.std, self.dst))
+                        Ok(crate::MappedLocalTime::Ambiguous(self.dst, self.std))
                     } else {
                         Ok(crate::MappedLocalTime::Single(self.std))
                     }
@@ -284,7 +284,7 @@ impl AlternateTime {
                     } else if local_time >= dst_end_transition_end
                         && local_time <= dst_end_transition_start
                     {
-                        Ok(crate::MappedLocalTime::Ambiguous(self.std, self.dst))
+                        Ok(crate::MappedLocalTime::Ambiguous(self.dst, self.std))
                     } else if local_time > dst_end_transition_end
                         && local_time < dst_start_transition_start
                     {
@@ -309,7 +309,7 @@ impl AlternateTime {
                     } else if local_time >= dst_start_transition_end
                         && local_time <= dst_start_transition_start
                     {
-                        Ok(crate::MappedLocalTime::Ambiguous(self.dst, self.std))
+                        Ok(crate::MappedLocalTime::Ambiguous(self.std, self.dst))
                     } else if local_time > dst_start_transition_start
                         && local_time < dst_end_transition_start
                     {
@@ -337,7 +337,7 @@ impl AlternateTime {
                     } else if local_time >= dst_start_transition_end
                         && local_time <= dst_start_transition_start
                     {
-                        Ok(crate::MappedLocalTime::Ambiguous(self.dst, self.std))
+                        Ok(crate::MappedLocalTime::Ambiguous(self.std, self.dst))
                     } else {
                         Ok(crate::MappedLocalTime::Single(self.dst))
                     }

diff --git a/src/offset/local/tz_info/timezone.rs b/src/offset/local/tz_info/timezone.rs
@@ -238,7 +238,7 @@ impl<'a> TimeZoneRef<'a> {
         let local_leap_time = local_time;
 
         // if we have at least one transition,
-        // we must check _all_ of them, incase of any Overlapping (MappedLocalTime::Ambiguous) or Skipping (MappedLocalTime::None) transitions
+        // we must check _all_ of them, in case of any Overlapping (MappedLocalTime::Ambiguous) or Skipping (MappedLocalTime::None) transitions
         let offset_after_last = if !self.transitions.is_empty() {
             let mut prev = self.local_time_types[0];
 
@@ -259,7 +259,8 @@ impl<'a> TimeZoneRef<'a> {
                         } else if local_leap_time >= transition_end
                             && local_leap_time <= transition_start
                         {
-                            if prev.ut_offset < after_ltt.ut_offset {
+                            // Going from local to UTC a bigger offset means an earlier time.
+                            if prev.ut_offset > after_ltt.ut_offset {
                                 return Ok(crate::MappedLocalTime::Ambiguous(prev, after_ltt));
                             } else {
                                 return Ok(crate::MappedLocalTime::Ambiguous(after_ltt, prev));
@@ -271,7 +272,8 @@ impl<'a> TimeZoneRef<'a> {
                         if local_leap_time < transition_start {
                             return Ok(crate::MappedLocalTime::Single(prev));
                         } else if local_leap_time == transition_end {
-                            if prev.ut_offset < after_ltt.ut_offset {
+                            // Going from local to UTC a bigger offset means an earlier time.
+                            if prev.ut_offset > after_ltt.ut_offset {
                                 return Ok(crate::MappedLocalTime::Ambiguous(prev, after_ltt));
                             } else {
                                 return Ok(crate::MappedLocalTime::Ambiguous(after_ltt, prev));