f685b60 · typeable/aeson

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

compare with master

unifiedsplit

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

44import Data.ByteString.Builder.Prim as BP

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

46import Data.Char (chr, ord)

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

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

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

49import Data.Text.Encoding (encodeUtf8BuilderEscaped)

50import Data.Time (UTCTime(..))

Data/Aeson/Text.hs+1−1

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

25

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

27import Data.Aeson.Encoding (encodingToLazyByteString)

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

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

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

30import Data.Text.Lazy.Builder

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

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

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

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

98import Data.List.NonEmpty (NonEmpty(..))

99import Data.Maybe (fromMaybe)

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

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

101import Data.Proxy (Proxy(..))

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

103import Data.Scientific (Scientific)

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

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

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

81import Data.List (intersperse)

82import Data.List.NonEmpty (NonEmpty(..))

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

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

84import Data.Proxy (Proxy(..))

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

86import Data.Scientific (Scientific)

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

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

861 where

862 taggedObject opts targs tagFieldName contentsFieldName =

863− fromPairs . (tag <>) . contents

863+ fromPairs . mappend tag . contents

864 where

865 tag = tagFieldName `pair`

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

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

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

1004 where

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

1006− pairsOf a <> pairsOf b

1006+ pairsOf a `mappend` pairsOf b

1007 where

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

1009 pairsOf = recordToPairs opts targs

aeson.cabal+1−1

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

102 build-depends:

103 attoparsec >= 0.13.0.1,

104 base >= 4.5 && < 5,

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

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

106 containers >= 0.4.2,

107 deepseq >= 1.3 && < 1.5,

108 dlist >= 0.6,

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

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

37 build-depends:

38 attoparsec >= 0.13.0.1,

39 base >= 4.5 && < 5,

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

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

41 text >= 1.1.1.0,

42 time >= 1.1.1.4

43

benchmarks/aeson-benchmarks.cabal+1−1

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

30 build-depends:

31 attoparsec >= 0.13.0.1,

32 base == 4.*,

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

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

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

35 containers,

36 deepseq,