eb60a38 · typeable/aeson

Data/Aeson.hs+1−1

@@ -149,7 +149,7 @@ import Data.Aeson.Types.FromJSON (ifromJSON, parseIndexedJSON)

149import Data.Aeson.Encoding (encodingToLazyByteString)

150import Data.Aeson.Parser.Internal (decodeWith, decodeStrictWith, eitherDecodeWith, eitherDecodeStrictWith, jsonEOF, json, jsonEOF', json')

151import Data.Aeson.Types

152−import Data.Aeson.Types.Internal (JSONPath, formatError, (<?>))

152+import Data.Aeson.Types.Internal (formatError)

153import qualified Data.ByteString as B

154import qualified Data.ByteString.Lazy as L

155

Data/Aeson/Encoding/Builder.hs−1

@@ -44,7 +44,6 @@ 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.Semigroup ((<>))

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

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

49import Data.Text.Encoding (encodeUtf8BuilderEscaped)

48import Data.Text.Encoding (encodeUtf8BuilderEscaped)

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

49import Data.Time (UTCTime(..))

Data/Aeson/Encoding/Internal.hs−1

@@ -63,7 +63,6 @@ import Data.Aeson.Types.Internal (Value)

63import Data.ByteString.Builder (Builder, char7, toLazyByteString)

64import Data.Int

65import Data.Scientific (Scientific)

66−import Data.Semigroup (Semigroup ((<>)))

67import Data.Text (Text)

66import Data.Text (Text)

68import Data.Time (Day, LocalTime, TimeOfDay, UTCTime, ZonedTime)

67import Data.Time (Day, LocalTime, TimeOfDay, UTCTime, ZonedTime)

69import Data.Typeable (Typeable)

68import Data.Typeable (Typeable)

Data/Aeson/Parser/Internal.hs−1

@@ -59,7 +59,6 @@ import Data.Attoparsec.ByteString.Char8 (Parser, char, decimal, endOfInput, isDi

59import Data.Function (fix)

60import Data.Functor.Compat (($>))

61import Data.Scientific (Scientific)

62−import Data.Semigroup ((<>))

63import Data.Text (Text)

62import Data.Text (Text)

64import Data.Vector (Vector)

63import Data.Vector (Vector)

65import qualified Data.Vector as Vector (empty, fromList, fromListN, reverse)

64import qualified Data.Vector as Vector (empty, fromList, fromListN, reverse)

Data/Aeson/TH.hs+4−1

@@ -116,7 +116,10 @@ module Data.Aeson.TH

116 , mkLiftParseJSON2

117 ) where

118

119−import Prelude.Compat

119+import Prelude.Compat hiding (fail)

120+

121+-- We don't have MonadFail Q, so we should use `fail` from real `Prelude`

122+import Prelude (fail)

120

123

121import Control.Applicative ((<|>))

124import Control.Applicative ((<|>))

122import Data.Aeson (Object, (.:), FromJSON(..), FromJSON1(..), FromJSON2(..), ToJSON(..), ToJSON1(..), ToJSON2(..))

125import Data.Aeson (Object, (.:), FromJSON(..), FromJSON1(..), FromJSON2(..), ToJSON(..), ToJSON1(..), ToJSON2(..))

Data/Aeson/Text.hs−1

@@ -26,7 +26,6 @@ import Prelude.Compat

26

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

28import Data.Aeson.Encoding (encodingToLazyByteString)

29−import Data.Semigroup ((<>))

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

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

31import Data.Text.Lazy.Builder

30import Data.Text.Lazy.Builder

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

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

Data/Aeson/Types/FromJSON.hs−1

@@ -96,7 +96,6 @@ import Data.Hashable (Hashable(..))

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

97import Data.List.NonEmpty (NonEmpty(..))

98import Data.Maybe (fromMaybe)

99−import Data.Semigroup ((<>))

100import Data.Proxy (Proxy(..))

99import Data.Proxy (Proxy(..))

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

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

102import Data.Scientific (Scientific, base10Exponent)

101import Data.Scientific (Scientific, base10Exponent)

Data/Aeson/Types/Internal.hs−1

@@ -95,7 +95,6 @@ import Data.HashMap.Strict (HashMap)

95import Data.Hashable (Hashable(..))

96import Data.List (intercalate)

97import Data.Scientific (Scientific)

98−import Data.Semigroup (Semigroup((<>)))

99import Data.String (IsString(..))

98import Data.String (IsString(..))

100import Data.Text (Text, pack, unpack)

99import Data.Text (Text, pack, unpack)

101import Data.Time (UTCTime)

100import Data.Time (UTCTime)

Data/Aeson/Types/ToJSON.hs−1

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

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

80import Data.List (intersperse)

81import Data.List.NonEmpty (NonEmpty(..))

82−import Data.Semigroup ((<>))

83import Data.Proxy (Proxy(..))

82import Data.Proxy (Proxy(..))

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

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

85import Data.Scientific (Scientific)

84import Data.Scientific (Scientific)

aeson.cabal+2−2

@@ -116,8 +116,8 @@ library

116

117 -- Compat

118 build-depends:

119− base-compat >= 0.9.1 && < 0.12,

119+ base-compat-batteries >= 0.10.0 && < 0.12,

120− time-compat >= 1.9.2.2 && < 1.10

120+ time-compat >= 1.9.2.2 && < 1.10

121

122 if !impl(ghc >= 8.6)

123 build-depends:

attoparsec-iso8601/Data/Attoparsec/Time/Internal.hs+3−18

@@ -1,4 +1,3 @@

1−{-# LANGUAGE CPP #-}

2{-# LANGUAGE NoImplicitPrelude #-}

1{-# LANGUAGE NoImplicitPrelude #-}

3-- |

2-- |

4-- Module: Data.Aeson.Internal.Time

3-- Module: Data.Aeson.Internal.Time

@@ -19,24 +18,10 @@ module Data.Attoparsec.Time.Internal

19

18

20import Prelude.Compat

19import Prelude.Compat

21

20

21+import Data.Fixed (Fixed(MkFixed), Pico)

22import Data.Int (Int64)

23−import Data.Time

23+import Data.Time (TimeOfDay(..))

24−import Unsafe.Coerce (unsafeCoerce)

25−

26−#if MIN_VERSION_time(1,6,0)

27−

28−import Data.Time.Clock (diffTimeToPicoseconds)

24+import Data.Time.Clock.Compat

29−

30−#endif

31−

32−import Data.Fixed (Pico, Fixed(MkFixed))

33−

34−#if !MIN_VERSION_time(1,6,0)

35−

36−diffTimeToPicoseconds :: DiffTime -> Integer

37−diffTimeToPicoseconds = unsafeCoerce

38−

39−#endif

40

25

41toPico :: Integer -> Pico

26toPico :: Integer -> Pico

42toPico = MkFixed

27toPico = MkFixed