0ecde77 · typeable/aeson

.gitignore+1

compare with master

unifiedsplit

@@ -1,5 +1,6 @@

1dist

2dist-newstyle

3+.ghc.environment.*

3.cabal-sandbox/

4.cabal-sandbox/

4cabal.sandbox.config

5cabal.sandbox.config

5.stack-work/

6.stack-work/

aeson.cabal+1−1

@@ -225,7 +225,7 @@ test-suite tests

225 unordered-containers,

226 uuid-types,

227 vector,

228− quickcheck-instances >=0.3.12

228+ quickcheck-instances >=0.3.14

229

230 if flag(bytestring-builder)

231 build-depends: bytestring >= 0.9 && < 0.10.4,

tests/Instances.hs−12

@@ -16,7 +16,6 @@ import Data.Aeson.Types

16import Data.Function (on)

17import Data.Functor.Compose (Compose (..))

18import Data.Proxy (Proxy(..))

19−import Data.Tagged (Tagged(..))

20import Data.Time (ZonedTime(..), TimeZone(..))

19import Data.Time (ZonedTime(..), TimeZone(..))

21import Data.Time.Clock (UTCTime(..))

20import Data.Time.Clock (UTCTime(..))

22import Functions

21import Functions

@@ -24,7 +23,6 @@ import Test.QuickCheck (Arbitrary(..), elements, oneof)

24import Types

23import Types

25import qualified Data.DList as DList

24import qualified Data.DList as DList

26import qualified Data.HashMap.Strict as HM

25import qualified Data.HashMap.Strict as HM

27−import qualified Data.UUID.Types as UUID

28

26

29#if !MIN_VERSION_QuickCheck(2,9,0)

27#if !MIN_VERSION_QuickCheck(2,9,0)

30import Control.Applicative (Const(..))

28import Control.Applicative (Const(..))

@@ -193,9 +191,6 @@ instance Arbitrary Natural where

193instance Arbitrary (Proxy a) where

191instance Arbitrary (Proxy a) where

194 arbitrary = pure Proxy

192 arbitrary = pure Proxy

195

193

196−instance Arbitrary b => Arbitrary (Tagged a b) where

197− arbitrary = Tagged <$> arbitrary

198−

199instance Arbitrary a => Arbitrary (DList.DList a) where

194instance Arbitrary a => Arbitrary (DList.DList a) where

200 arbitrary = DList.fromList <$> arbitrary

195 arbitrary = DList.fromList <$> arbitrary

201

196

@@ -220,10 +215,3 @@ makeVersion b = Version b []

220instance Arbitrary a => Arbitrary (Identity a) where

215instance Arbitrary a => Arbitrary (Identity a) where

221 arbitrary = Identity <$> arbitrary

216 arbitrary = Identity <$> arbitrary

222#endif

217#endif

223−

224−instance Arbitrary UUID.UUID where

225− arbitrary = UUID.fromWords

226− <$> arbitrary

227− <*> arbitrary

228− <*> arbitrary

229− <*> arbitrary