974733b · typeable/bloodhound

git.iko.soy/typeable/bloodhound

Merge pull request #165 from bitemyapp/aeson-1.1

Aeson 1.1

commit974733bce7f45b5c00b72c0f72164b9bcf375bb3 authorChris Allen <cma@bitemyapp.com> dateWed 11 Jan 2017, 18:10 (10 years ago) parent244a123 908e23e

4 files changed+4−4

unifiedsplit

bloodhound.cabal+1−1

@@ -32,7 +32,7 @@ library

3232 build-depends: base >= 4.3 && <5,

3333 bytestring >= 0.10.0 && <0.11,

3434 containers >= 0.5.0.0 && <0.6,

35− aeson >= 0.11.1 && <1.1,

35+ aeson >= 0.11.1 && <1.2,

3636 http-client >= 0.4.30 && <0.6,

3737 network-uri >= 2.6 && <2.7,

3838 semigroups >= 0.15 && <0.19,

src/Database/Bloodhound/Types.hs+1−1

@@ -2012,7 +2012,7 @@ instance BucketAggregation DateRangeResult where

20122012 docCount = dateRangeDocCount

20132013 aggs = dateRangeAggs

20142014

2015−instance (FromJSON a, BucketAggregation a) => FromJSON (Bucket a) where

2015+instance (FromJSON a) => FromJSON (Bucket a) where

20162016 parseJSON (Object v) = Bucket <$>

20172017 v .: "buckets"

20182018 parseJSON _ = mempty

stack-8.0.yaml+1−1

@@ -3,7 +3,7 @@ packages:

33- '.'

44extra-deps:

55- quickcheck-properties-0.1

6−

6+- aeson-1.1.0.0

77# - http-client-0.5.0

88# - fail-4.9.0.0

99# - http-types-0.9

tests/tests.hs+1−1

@@ -586,7 +586,7 @@ instance ApproxEq Vers.Version where

586586 (=~) = (==)

587587instance (ApproxEq a, Show a) => ApproxEq [a] where

588588 as =~ bs = and (zipWith (=~) as bs)

589−instance (ApproxEq l, Show l, ApproxEq r, Show r) => ApproxEq (Either l r) where

589+instance (ApproxEq l, ApproxEq r) => ApproxEq (Either l r) where

590590 Left a =~ Left b = a =~ b

591591 Right a =~ Right b = a =~ b

592592 _ =~ _ = False