Skip to content

Remove orphan instances for Text and UTCTime #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
adinapoli wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Remove orphan instances for Text and UTCTime #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce72967
Use GHC2021 as Default-Language
adinapoli Nov 4, 2025
a7d607f
Use quickcheck-instances for Text and UTCTime
adinapoli Nov 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions api-tools.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ Library
containers >= 0.5 && < 0.8 ,
deepseq >= 1.1 && < 1.6 ,
lens >= 3.8.7 && < 5.4 ,
quickcheck-instances < 0.4 ,
regex-base >= 0.93 && < 0.95 ,
regex-tdfa >= 1.1.0 && < 1.4 ,
safe >= 0.3.3 && < 0.4 ,
Expand Down Expand Up @@ -124,7 +125,7 @@ Library
-Wall
-fwarn-tabs

Default-Language: Haskell2010
Default-Language: GHC2021


Executable migration-tool
Expand All @@ -143,7 +144,7 @@ Executable migration-tool
-Wall
-fwarn-tabs

Default-Language: Haskell2010
Default-Language: GHC2021


Executable perf-test
Expand All @@ -164,7 +165,7 @@ Executable perf-test
-fwarn-tabs
-rtsopts

Default-Language: Haskell2010
Default-Language: GHC2021


Test-Suite test-api-tools
Expand Down Expand Up @@ -205,7 +206,7 @@ Test-Suite test-api-tools
GHC-Options:
-Wall

Default-Language: Haskell2010
Default-Language: GHC2021

Benchmark bench-time
Hs-Source-Dirs: bench
Expand All @@ -224,4 +225,4 @@ Benchmark bench-time
GHC-Options:
-Wall

Default-Language: Haskell2010
Default-Language: GHC2021
17 changes: 1 addition & 16 deletions src/Data/API/Time.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import Data.Time

import GHC.Stack
import Test.QuickCheck as QC
import Test.QuickCheck.Instances.Time ()

utcFormat :: String
utcFormat = "%Y-%m-%dT%H:%M:%SZ"
Expand Down Expand Up @@ -136,19 +137,3 @@ unsafeParseDay :: HasCallStack => T.Text -> Day
unsafeParseDay t = fromMaybe (error msg) (parseDay t)
where
msg = "unsafeParseDay: unable to parse: " ++ T.unpack t


-- TODO: use a more arbitrary instance (quickcheck-instances?)
-- (in particular, there are no subsecond-resolution times here)
instance QC.Arbitrary UTCTime where
arbitrary = QC.oneof
[ QC.elements [mk "2010-01-01T00:00:00Z"
, mk "2013-05-27T19:13:50Z"
, mk "2011-07-20T22:04:00Z"
, mk "2012-02-02T15:45:11Z"
, mk "2009-11-12T20:57:54Z"
, mk "2000-10-28T21:03:24Z"
, mk "1965-03-10T09:23:01Z"
]]
where
mk = unsafeParseUTC
4 changes: 1 addition & 3 deletions src/Data/API/Types.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ import qualified Data.Text as T
import qualified Data.Text.Encoding as T
import qualified Data.ByteString.Char8 as B
import Test.QuickCheck as QC
import Test.QuickCheck.Instances.Text ()
import Control.Applicative
import qualified Data.ByteString.Base64 as B64
import Language.Haskell.TH
Expand Down Expand Up @@ -334,9 +335,6 @@ instance ToJSON Binary where
instance FromJSON Binary where
parseJSON = withBinary "Binary" return

instance QC.Arbitrary T.Text where
arbitrary = T.pack <$> QC.arbitrary

instance QC.Arbitrary Binary where
arbitrary = Binary <$> B.pack <$> QC.arbitrary

Expand Down
Loading