Merge pull request #2 from tmcgilchrist/speculative-ghc-versions

Various fixes for thyme

Author: fumieval

.github/workflows/haskell.yml

@@ -0,0 +1,49 @@
+name: CI
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    types:
+      - opened
+      - synchronize
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        os:    [macos-latest, ubuntu-latest]
+        cabal: ["3.8"]
+        ghc:   ["8.4.4", "8.6.5", "8.8.4", "8.10.7", "9.0.2", "9.2.6", "9.4.4"]
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: haskell/actions/setup@v2
+        id: setup-haskell-cabal
+        with:
+          ghc-version: ${{ matrix.ghc }}
+          cabal-version: ${{ matrix.cabal }}
+      - name: Cabal Update
+        run: |
+          cabal v2-update
+          cabal v2-freeze $CONFIG
+      - uses: actions/[email protected]
+        with:
+          path: |
+            ${{ steps.setup-haskell-cabal.outputs.cabal-store }}
+            dist-newstyle
+          key: ${{ runner.os }}-${{ matrix.ghc }}-${{ hashFiles('cabal.project.freeze') }}
+          restore-keys: |
+            ${{ runner.os }}-${{ matrix.ghc }}-${{ matrix.cabal }}-
+      - name: Build all
+        run: |
+          cabal build all
+          cabal sdist all
+      - name: Run tests
+        run: |
+           cabal test all
+      - name: Build haddock
+        run: |
+          cabal haddock all

.gitignore

@@ -1 +1,2 @@
 /dist/
+/dist-newstyle/

.travis.yml

@@ -344,7 +344,7 @@ diffAbsoluteTime = (.-.)
 -- @
 {-# INLINE utcToTAITime #-}
 utcToTAITime :: TAIUTCMap -> UTCTime -> AbsoluteTime
-utcToTAITime = view . absoluteTime
+utcToTAITime m = view (absoluteTime m)
 
 -- | Using a 'TAIUTCMap', convert a 'AbsoluteTime' to 'UTCTime'.
 --
@@ -353,5 +353,5 @@ utcToTAITime = view . absoluteTime
 -- @
 {-# INLINE taiToUTCTime #-}
 taiToUTCTime :: TAIUTCMap -> AbsoluteTime -> UTCTime
-taiToUTCTime = review . absoluteTime
+taiToUTCTime m = review (absoluteTime m)
 

src/Data/Thyme/Clock/TAI.hs

@@ -3,7 +3,8 @@
 {-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE StandaloneDeriving #-}
 {-# LANGUAGE ViewPatterns #-}
-{-# OPTIONS_GHC -fno-warn-orphans #-}
+{-# OPTIONS_GHC -fno-warn-orphans -Wno-unused-record-wildcards #-}
+
 #include "thyme.h"
 
 -- | Formatting and parsing for dates and times.

src/Data/Thyme/Format.hs

@@ -620,7 +620,7 @@ timeOfDayToDayFraction = view dayFraction
 -- @
 {-# INLINE utcToLocalTime #-}
 utcToLocalTime :: TimeZone -> UTCTime -> LocalTime
-utcToLocalTime = view . utcLocalTime
+utcToLocalTime tz = view (utcLocalTime tz)
 
 -- | Convert a 'LocalTime' in the given 'TimeZone' to a 'UTCTime'.
 --
@@ -629,7 +629,7 @@ utcToLocalTime = view . utcLocalTime
 -- @
 {-# INLINE localTimeToUTC #-}
 localTimeToUTC :: TimeZone -> LocalTime -> UTCTime
-localTimeToUTC = review . utcLocalTime
+localTimeToUTC tz = review (utcLocalTime tz)
 
 -- | Convert a 'UniversalTime' to a 'LocalTime' at the given medidian in
 -- degrees East.
@@ -639,7 +639,7 @@ localTimeToUTC = review . utcLocalTime
 -- @
 {-# INLINE ut1ToLocalTime #-}
 ut1ToLocalTime :: Rational -> UniversalTime -> LocalTime
-ut1ToLocalTime = view . ut1LocalTime
+ut1ToLocalTime l = view (ut1LocalTime l)
 
 -- | Convert a 'LocalTime' at the given meridian in degrees East to
 -- a 'UniversalTime'.
@@ -649,7 +649,7 @@ ut1ToLocalTime = view . ut1LocalTime
 -- @
 {-# INLINE localTimeToUT1 #-}
 localTimeToUT1 :: Rational -> LocalTime -> UniversalTime
-localTimeToUT1 = review . ut1LocalTime
+localTimeToUT1 l = review (ut1LocalTime l)
 
 -- | Convert a 'UTCTime' and the given 'TimeZone' into a 'ZonedTime'.
 --

src/Data/Thyme/LocalTime.hs

@@ -34,7 +34,7 @@ import qualified Data.Time.Calendar as T
 import qualified Data.Time.Clock as T
 import qualified Data.Time.Clock.TAI as T
 import qualified Data.Time.LocalTime as T
-import Unsafe.TrueName
+import Data.Thyme.TrueName
 
 ------------------------------------------------------------------------
 -- * Type conversion