Fix crash by using default hashing and equality for the config

kickstarter · Sep 6, 2023 · 924181b · 924181b
1 parent de2ae46
commit 924181b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 20 deletions.
diff --git a/Library/Format.swift b/Library/Format.swift
@@ -403,7 +403,7 @@ public enum Format {
 
 public let defaultThresholdInDays = 30 // days
 
-internal struct DateFormatterConfig {
+internal struct DateFormatterConfig: Hashable {
   let dateFormat: String?
   fileprivate let dateStyle: DateFormatter.Style?
   fileprivate let locale: Locale
@@ -439,25 +439,6 @@ internal struct DateFormatterConfig {
   }
 }
 
-extension DateFormatterConfig: Hashable {
-  func hash(into hasher: inout Hasher) {
-    hasher.combine(self.template)
-    hasher.combine(self.dateStyle)
-    hasher.combine(self.locale)
-    hasher.combine(self.timeStyle)
-    hasher.combine(self.timeZone)
-  }
-}
-
-func == (lhs: DateFormatterConfig, rhs: DateFormatterConfig) -> Bool {
-  return
-    lhs.template == rhs.template
-      && lhs.dateStyle == rhs.dateStyle
-      && lhs.locale == rhs.locale
-      && lhs.timeStyle == rhs.timeStyle
-      && lhs.timeZone == rhs.timeZone
-}
-
 private struct NumberFormatterConfig {
   fileprivate let numberStyle: NumberFormatter.Style
   fileprivate let roundingMode: NumberFormatter.RoundingMode

diff --git a/Library/FormatTests.swift b/Library/FormatTests.swift
@@ -540,6 +540,12 @@ final class FormatTests: TestCase {
       let date = Format.date(from: dateString, dateFormat: format, timeZone: PST)
       XCTAssertEqual(date?.description, "2018-01-01 08:00:00 +0000")
     }
+
+    // Test different format
+    withEnvironment(calendar: calEST) {
+      let date = Format.date(from: "2018-01-14", dateFormat: "yyyy-MM-dd")
+      XCTAssertEqual(date?.description, "2018-01-14 05:00:00 +0000")
+    }
   }
 
   func testDuration() {