9f24bed · typeable/aeson

git.iko.soy/typeable/aeson

Merge pull request #630 from phadej/base-compat-0.10

Allow base-compat-0.10.0

commit9f24bedbd83b8137e8e9afbc8babb154915ed3f1 authorAdam Bergmark <adam@bergmark.nl> dateSat 7 Apr 2018, 20:20 (9 years ago) parent84ef299 f685b60

7 files changed+9−9

compare with master

unifiedsplit

Data/Aeson/Encoding/Builder.hs+1−1 Data/Aeson/Text.hs+1−1 Data/Aeson/Types/FromJSON.hs+1−1 Data/Aeson/Types/ToJSON.hs+3−3 aeson.cabal+1−1 attoparsec-iso8601/attoparsec-iso8601.cabal+1−1 benchmarks/aeson-benchmarks.cabal+1−1

Data/Aeson/Encoding/Builder.hs+1−1

@@ -44,7 +44,7 @@ import Data.ByteString.Builder as B

4444import Data.ByteString.Builder.Prim as BP

4545import Data.ByteString.Builder.Scientific (scientificBuilder)

4646import Data.Char (chr, ord)

47−import Data.Monoid ((<>))

47+import Data.Semigroup ((<>))

4848import Data.Scientific (Scientific, base10Exponent, coefficient)

4949import Data.Text.Encoding (encodeUtf8BuilderEscaped)

5050import Data.Time (UTCTime(..))

Data/Aeson/Text.hs+1−1

@@ -25,7 +25,7 @@ import Prelude.Compat

2525

2626import Data.Aeson.Types (Value(..), ToJSON(..))

2727import Data.Aeson.Encoding (encodingToLazyByteString)

28−import Data.Monoid ((<>))

28+import Data.Semigroup ((<>))

2929import Data.Scientific (FPFormat(..), Scientific, base10Exponent)

3030import Data.Text.Lazy.Builder

3131import Data.Text.Lazy.Builder.Scientific (formatScientificBuilder)

Data/Aeson/Types/FromJSON.hs+1−1

@@ -97,7 +97,7 @@ import Data.Hashable (Hashable(..))

9797import Data.Int (Int16, Int32, Int64, Int8)

9898import Data.List.NonEmpty (NonEmpty(..))

9999import Data.Maybe (fromMaybe)

100−import Data.Monoid ((<>))

100+import Data.Semigroup ((<>))

101101import Data.Proxy (Proxy(..))

102102import Data.Ratio ((%), Ratio)

103103import Data.Scientific (Scientific)

Data/Aeson/Types/ToJSON.hs+3−3

@@ -80,7 +80,7 @@ import Data.Functor.Sum (Sum(..))

8080import Data.Int (Int16, Int32, Int64, Int8)

8181import Data.List (intersperse)

8282import Data.List.NonEmpty (NonEmpty(..))

83−import Data.Monoid ((<>))

83+import Data.Semigroup ((<>))

8484import Data.Proxy (Proxy(..))

8585import Data.Ratio (Ratio, denominator, numerator)

8686import Data.Scientific (Scientific)

@@ -860,7 +860,7 @@ instance ( IsRecord a isRecord

860860 ) => TaggedObject enc arity (C1 c a)

861861 where

862862 taggedObject opts targs tagFieldName contentsFieldName =

863− fromPairs . (tag <>) . contents

863+ fromPairs . mappend tag . contents

864864 where

865865 tag = tagFieldName `pair`

866866 (fromString (constructorTagModifier opts (conName (undefined :: t c a p)))

@@ -1003,7 +1003,7 @@ instance ( Monoid pairs

10031003 ) => RecordToPairs enc pairs arity (a :*: b)

10041004 where

10051005 recordToPairs opts (targs :: ToArgs enc arity p) (a :*: b) =

1006− pairsOf a <> pairsOf b

1006+ pairsOf a `mappend` pairsOf b

10071007 where

10081008 pairsOf :: (RecordToPairs enc pairs arity f) => f p -> pairs

10091009 pairsOf = recordToPairs opts targs

aeson.cabal+1−1

@@ -102,7 +102,7 @@ library

102102 build-depends:

103103 attoparsec >= 0.13.0.1,

104104 base >= 4.5 && < 5,

105− base-compat >= 0.9.1 && < 0.10,

105+ base-compat >= 0.9.1 && < 0.11,

106106 containers >= 0.4.2,

107107 deepseq >= 1.3 && < 1.5,

108108 dlist >= 0.6,

attoparsec-iso8601/attoparsec-iso8601.cabal+1−1

@@ -37,7 +37,7 @@ library

3737 build-depends:

3838 attoparsec >= 0.13.0.1,

3939 base >= 4.5 && < 5,

40− base-compat >= 0.9.1 && < 0.10,

40+ base-compat >= 0.9.1 && < 0.11,

4141 text >= 1.1.1.0,

4242 time >= 1.1.1.4

4343

benchmarks/aeson-benchmarks.cabal+1−1

@@ -30,7 +30,7 @@ library

3030 build-depends:

3131 attoparsec >= 0.13.0.1,

3232 base == 4.*,

33− base-compat >= 0.9.1 && <0.10,

33+ base-compat >= 0.9.1 && <0.11,

3434 time-locale-compat >=0.1.1 && <0.2,

3535 containers,

3636 deepseq,