git.iko.soy/typeable/aeson
on master help sign in
Fix test build failures with GHC 7.10
commita7e13ada86468ba067331f53a54f66a1a3fbe39d authorBryan O'Sullivan <bos@serpentine.com> dateMon 11 May 2015, 16:56 (11 years ago) parentdd20c88
3 files changed+18−9
compare with master
unifiedsplit
Data/Aeson/Types/Instances.hs+6−5 aeson.cabal+5−1 tests/Properties.hs+7−3
Data/Aeson/Types/Instances.hs+6−5
@@ -78,11 +78,6 @@ import Data.Traversable (traverse)
7878import Data.Vector (Vector)
7979import Data.Word (Word, Word8, Word16, Word32, Word64)
8080import Foreign.Storable (Storable)
81−#if MIN_VERSION_time(1,5,0)
82−import Data.Time.Format(defaultTimeLocale, dateTimeFmt)
83−#else
84−import System.Locale (defaultTimeLocale, dateTimeFmt)
85−#endif
8681import qualified Data.HashMap.Strict as H
8782import qualified Data.HashSet as HashSet
8883import qualified Data.IntMap as IntMap
@@ -100,6 +95,12 @@ import qualified Data.Vector.Storable as VS
10095import qualified Data.Vector.Unboxed as VU
10196import qualified Data.Vector.Mutable as VM ( unsafeNew, unsafeWrite )
10297
98+#if MIN_VERSION_time(1,5,0)
99+import Data.Time.Format (defaultTimeLocale, dateTimeFmt)
100+#else
101+import System.Locale (defaultTimeLocale, dateTimeFmt)
102+#endif
103+
103104instance (ToJSON a) => ToJSON (Identity a) where
104105 toJSON (Identity a) = toJSON a
105106 {-# INLINE toJSON #-}
aeson.cabal+5−1
@@ -152,7 +152,6 @@ test-suite tests
152152 bytestring,
153153 containers,
154154 ghc-prim >= 0.2,
155− old-locale,
156155 template-haskell,
157156 test-framework,
158157 test-framework-hunit,
@@ -162,6 +161,11 @@ test-suite tests
162161 unordered-containers,
163162 vector
164163
164+ if flag(old-locale)
165+ build-depends: time < 1.5, old-locale
166+ else
167+ build-depends: time >= 1.5
168+
165169source-repository head
166170 type: git
167171 location: git://github.com/bos/aeson.git
tests/Properties.hs+7−3
@@ -23,14 +23,18 @@ import Instances ()
2323import Types
2424import Encoders
2525import Properties.Deprecated (deprecatedTests)
26+import System.IO
27+import System.IO.Unsafe (unsafePerformIO)
28+
2629#ifdef GHC_GENERICS
2730import Data.Int
2831import qualified Data.Map as Map
2932#endif
3033
31−import System.IO
32−import System.IO.Unsafe (unsafePerformIO)
33−import System.Locale
34+#if !MIN_VERSION_time(1,5,0)
35+import System.Locale (defaultTimeLocale, dateTimeFmt)
36+#endif
37+
3438
3539roundTripCamel :: String -> Assertion
3640roundTripCamel name = assertEqual "" name (camelFrom '_' $ camelTo '_' name)