e27ec46 · typeable/aeson

git.iko.soy/typeable/aeson

Merge

commite27ec460984ed6c99a4056f21ba3346f03cd4b8c authorBryan O'Sullivan <bos@serpentine.com> dateTue 13 May 2014, 21:26 (12 years ago) parenta718d20 af7d569

2 files changed+3−2

compare with master

unifiedsplit

Data/Aeson/Encode.hs+2−1 aeson.cabal+1−1

Data/Aeson/Encode.hs+2−1

@@ -29,9 +29,10 @@ module Data.Aeson.Encode

2929

3030import Data.Aeson.Types (Value(..))

3131import Data.Monoid (mappend)

32−import Data.Scientific (Scientific, coefficient, base10Exponent, scientificBuilder)

32+import Data.Scientific (Scientific, coefficient, base10Exponent)

3333import Data.Text.Lazy.Builder

3434import Data.Text.Lazy.Builder.Int (decimal)

35+import Data.Text.Lazy.Builder.Scientific (scientificBuilder)

3536import Numeric (showHex)

3637import qualified Data.HashMap.Strict as H

3738import qualified Data.Text as T

aeson.cabal+1−1

@@ -103,7 +103,7 @@ library

103103 hashable >= 1.1.2.0,

104104 mtl,

105105 old-locale,

106− scientific >= 0.2 && < 0.3,

106+ scientific >= 0.3,

107107 syb,

108108 template-haskell >= 2.4,

109109 text >= 1.1.1.0,