git.iko.soy/typeable/aeson
on master help sign in
Merge pull request #703 from bos/primitive-0.7

Support primitive 0.7.* (fixes #702)

commit7e89722183f7dbde7cbe133eaff15d5bfec3889b authorAdam Bergmark <adam@bergmark.nl> dateThu 30 May 2019, 15:31 (7 years ago) parentf2bf9f7c1907c9
3 files changed+9−1
compare with master
unifiedsplit
Data/Aeson/Types/FromJSON.hs+4 Data/Aeson/Types/ToJSON.hs+4 aeson.cabal+1−1
Data/Aeson/Types/FromJSON.hs+4
@@ -149,7 +149,9 @@ import qualified Data.Primitive.SmallArray as PM
149149import qualified Data.Primitive.Types as PM
150150
151151#if MIN_VERSION_primitive(0,6,4)
152+#if !MIN_VERSION_primitive(0,7,0)
152153import qualified Data.Primitive.UnliftedArray as PM
154+#endif
153155import qualified Data.Primitive.PrimArray as PM
154156#endif
155157
@@ -1938,10 +1940,12 @@ instance FromJSON a => FromJSON (PM.SmallArray a) where
19381940instance (PM.Prim a,FromJSON a) => FromJSON (PM.PrimArray a) where
19391941 parseJSON = fmap Exts.fromList . parseJSON
19401942
1943+#if !MIN_VERSION_primitive(0,7,0)
19411944instance (PM.PrimUnlifted a,FromJSON a) => FromJSON (PM.UnliftedArray a) where
19421945 parseJSON = fmap Exts.fromList . parseJSON
19431946#endif
19441947#endif
1948+#endif
19451949
19461950-------------------------------------------------------------------------------
19471951-- time
Data/Aeson/Types/ToJSON.hs+4
@@ -135,7 +135,9 @@ import qualified Data.Primitive.SmallArray as PM
135135import qualified Data.Primitive.Types as PM
136136
137137#if MIN_VERSION_primitive(0,6,4)
138+#if !MIN_VERSION_primitive(0,7,0)
138139import qualified Data.Primitive.UnliftedArray as PM
140+#endif
139141import qualified Data.Primitive.PrimArray as PM
140142#endif
141143
@@ -1957,11 +1959,13 @@ instance (PM.Prim a,ToJSON a) => ToJSON (PM.PrimArray a) where
19571959 toJSON = toJSON . Exts.toList
19581960 toEncoding = toEncoding . Exts.toList
19591961
1962+#if !MIN_VERSION_primitive(0,7,0)
19601963instance (PM.PrimUnlifted a,ToJSON a) => ToJSON (PM.UnliftedArray a) where
19611964 toJSON = toJSON . Exts.toList
19621965 toEncoding = toEncoding . Exts.toList
19631966#endif
19641967#endif
1968+#endif
19651969
19661970-------------------------------------------------------------------------------
19671971-- time
aeson.cabal+1−1
@@ -148,7 +148,7 @@ library
148148
149149 -- not in LTS-12.10
150150 tagged >= 0.8.5 && < 0.9,
151− primitive >= 0.6.3.0 && < 0.7
151+ primitive >= 0.6.3.0 && < 0.8
152152
153153 -- Other dependencies
154154 build-depends: