git.iko.soy/typeable/aeson
on master help sign in
Merge pull request #703 from bos/primitive-0.7
7e89722Adam Bergmark
Data/Aeson/Types/FromJSON.hs+4
compare with master
unifiedsplit
@@ -149,7 +149,9 @@ import qualified Data.Primitive.SmallArray as PM
149import qualified Data.Primitive.Types as PM
149import qualified Data.Primitive.Types as PM
150
150
151#if MIN_VERSION_primitive(0,6,4)
151#if MIN_VERSION_primitive(0,6,4)
152+#if !MIN_VERSION_primitive(0,7,0)
152import qualified Data.Primitive.UnliftedArray as PM
153import qualified Data.Primitive.UnliftedArray as PM
154+#endif
153import qualified Data.Primitive.PrimArray as PM
155import qualified Data.Primitive.PrimArray as PM
154#endif
156#endif
155
157
@@ -1938,10 +1940,12 @@ instance FromJSON a => FromJSON (PM.SmallArray a) where
1938instance (PM.Prim a,FromJSON a) => FromJSON (PM.PrimArray a) where
1940instance (PM.Prim a,FromJSON a) => FromJSON (PM.PrimArray a) where
1939 parseJSON = fmap Exts.fromList . parseJSON
1941 parseJSON = fmap Exts.fromList . parseJSON
1940
1942
1943+#if !MIN_VERSION_primitive(0,7,0)
1941instance (PM.PrimUnlifted a,FromJSON a) => FromJSON (PM.UnliftedArray a) where
1944instance (PM.PrimUnlifted a,FromJSON a) => FromJSON (PM.UnliftedArray a) where
1942 parseJSON = fmap Exts.fromList . parseJSON
1945 parseJSON = fmap Exts.fromList . parseJSON
1943#endif
1946#endif
1944#endif
1947#endif
1948+#endif
1945
1949
1946-------------------------------------------------------------------------------
1950-------------------------------------------------------------------------------
1947-- time
1951-- time
Data/Aeson/Types/ToJSON.hs+4
@@ -135,7 +135,9 @@ import qualified Data.Primitive.SmallArray as PM
135import qualified Data.Primitive.Types as PM
135import qualified Data.Primitive.Types as PM
136
136
137#if MIN_VERSION_primitive(0,6,4)
137#if MIN_VERSION_primitive(0,6,4)
138+#if !MIN_VERSION_primitive(0,7,0)
138import qualified Data.Primitive.UnliftedArray as PM
139import qualified Data.Primitive.UnliftedArray as PM
140+#endif
139import qualified Data.Primitive.PrimArray as PM
141import qualified Data.Primitive.PrimArray as PM
140#endif
142#endif
141
143
@@ -1957,11 +1959,13 @@ instance (PM.Prim a,ToJSON a) => ToJSON (PM.PrimArray a) where
1957 toJSON = toJSON . Exts.toList
1959 toJSON = toJSON . Exts.toList
1958 toEncoding = toEncoding . Exts.toList
1960 toEncoding = toEncoding . Exts.toList
1959
1961
1962+#if !MIN_VERSION_primitive(0,7,0)
1960instance (PM.PrimUnlifted a,ToJSON a) => ToJSON (PM.UnliftedArray a) where
1963instance (PM.PrimUnlifted a,ToJSON a) => ToJSON (PM.UnliftedArray a) where
1961 toJSON = toJSON . Exts.toList
1964 toJSON = toJSON . Exts.toList
1962 toEncoding = toEncoding . Exts.toList
1965 toEncoding = toEncoding . Exts.toList
1963#endif
1966#endif
1964#endif
1967#endif
1968+#endif
1965
1969
1966-------------------------------------------------------------------------------
1970-------------------------------------------------------------------------------
1967-- time
1971-- time
aeson.cabal+1−1
@@ -148,7 +148,7 @@ library
148
148
149 -- not in LTS-12.10
149 -- not in LTS-12.10
150 tagged >= 0.8.5 && < 0.9,
150 tagged >= 0.8.5 && < 0.9,
151− primitive >= 0.6.3.0 && < 0.7
151+ primitive >= 0.6.3.0 && < 0.8
152
152
153 -- Other dependencies
153 -- Other dependencies
154 build-depends:
154 build-depends: