More

haskellari · Dec 23, 2024 · 3772724 · 3772724
1 parent fc08393
commit 3772724
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/Data/Time/Calendar/Types.hs b/src/Data/Time/Calendar/Types.hs
@@ -18,7 +18,7 @@ import Data.Time.Calendar.WeekDate (WeekOfYear)
 #endif
 
 #if MIN_VERSION_time(1,12,1)
-import Data.Time.Calendar (CommonEra, BeforeCommonEra)
+import Data.Time.Calendar (pattern CommonEra, pattern BeforeCommonEra)
 #endif
 
 #if !MIN_VERSION_time(1,11,0)

diff --git a/src/Data/Time/Clock/Compat.hs b/src/Data/Time/Clock/Compat.hs
@@ -63,9 +63,13 @@ nominalDiffTimeToSeconds = realToFrac
 #if !MIN_VERSION_time(1,14,0)
 instance TH.Lift DiffTime where
     lift x = [| picosecondsToDiffTime $(TH.lift (diffTimeToPicoseconds x)) |]
-    liftTyped x = [|| picosecondsToDiffTime $$(TH.liftTyped (diffTimeToPicoseconds x)) ||]
+    liftTyped x = [|| picosecondsToDiffTime x' ||]
+      where
+        x' = diffTimeToPicoseconds x
 
 instance TH.Lift NominalDiffTime where
     lift x = [| secondsToNominalDiffTime (MkFixed $(TH.lift (case nominalDiffTimeToSeconds x of MkFixed y -> y))) |]
-    liftTyped x = [|| secondsToNominalDiffTime (MkFixed $$(TH.liftTyped (case nominalDiffTimeToSeconds x of MkFixed y -> y))) ||]
+    liftTyped x = [|| secondsToNominalDiffTime (MkFixed x') ||]
+      where
+        x' = case nominalDiffTimeToSeconds x of MkFixed y -> y
 #endif
diff --git a/test/main/Test/Format/Compile.hs b/test/main/Test/Format/Compile.hs
@@ -5,6 +5,7 @@ module Test.Format.Compile (
 
 ) where
 
+{-
 import Data.Time.Compat
 
 newtype WrappedUTCTime
@@ -14,3 +15,4 @@ newtype WrappedUTCTime
 newtype Wrapped t
     = MkWrapped t
     deriving (FormatTime, ParseTime)
+-}