ab65a2b · typeable/aeson

git.iko.soy/typeable/aeson

Normalize import declarations

commitab65a2b300db1e0b33a68bca7f2ab7ee53736e3c authorAdam Bergmark <adam@bergmark.nl> dateSat 30 Jul 2016, 14:09 (10 years ago) parent29eeac4

13 files changed+163−203

compare with master

unifiedsplit

Data/Aeson.hs+1−3 Data/Aeson/Encode.hs−1 Data/Aeson/Encoding/Internal.hs+11−14 Data/Aeson/Parser.hs+1−3 Data/Aeson/Parser/Internal.hs+1−2 Data/Aeson/Parser/Time.hs+1−1 Data/Aeson/TH.hs+37−54 Data/Aeson/Text.hs+1−2 Data/Aeson/Types.hs+1−2 Data/Aeson/Types/Class.hs+1−1 Data/Aeson/Types/FromJSON.hs+50−56 Data/Aeson/Types/Internal.hs+3−3 Data/Aeson/Types/ToJSON.hs+55−61

Data/Aeson.hs+1−3

@@ -115,9 +115,7 @@ import Prelude.Compat (Maybe, either, Either(..), uncurry, String, (.))

115115

116116import Data.Aeson.Types.FromJSON (ifromJSON)

117117import Data.Aeson.Encoding (encodingToLazyByteString)

118−import Data.Aeson.Parser.Internal (decodeWith, decodeStrictWith,

119− eitherDecodeWith, eitherDecodeStrictWith,

120− jsonEOF, json, jsonEOF', json')

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

121119import Data.Aeson.Types

122120import Data.Aeson.Types.Internal (JSONPath, formatError)

123121import qualified Data.ByteString as B

Data/Aeson/Encode.hs−1

@@ -15,7 +15,6 @@ module Data.Aeson.Encode {-# DEPRECATED "Use Data.Aeson or Data.Aeson.Text inste

1515

1616import Data.ByteString.Lazy (ByteString)

1717import Data.Text.Lazy.Builder (Builder)

18−

1918import qualified Data.Aeson as A

2019import qualified Data.Aeson.Text as A

2120

Data/Aeson/Encoding/Internal.hs+11−14

@@ -53,25 +53,22 @@ module Data.Aeson.Encoding.Internal

5353 , comma, colon, openBracket, closeBracket, openCurly, closeCurly

5454 ) where

5555

56−import Prelude ()

56+import Prelude ()

5757import Prelude.Compat

5858

59−import Data.ByteString.Builder (Builder, char7, toLazyByteString)

59+import Data.Aeson.Types.Internal (Value)

60+import Data.ByteString.Builder (Builder, char7, toLazyByteString)

6061import Data.Int

61−import Data.Scientific (Scientific)

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

63−import Data.Text (Text)

64−import Data.Time (Day, LocalTime, TimeOfDay, UTCTime,

65− ZonedTime)

66−import Data.Typeable (Typeable)

62+import Data.Scientific (Scientific)

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

64+import Data.Text (Text)

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

66+import Data.Typeable (Typeable)

6767import Data.Word

68−

69−import Data.Aeson.Types.Internal (Value)

70−

7168import qualified Data.Aeson.Encoding.Builder as EB

72−import qualified Data.ByteString.Builder as B

73−import qualified Data.ByteString.Lazy as BSL

74−import qualified Data.Text.Lazy as LT

69+import qualified Data.ByteString.Builder as B

70+import qualified Data.ByteString.Lazy as BSL

71+import qualified Data.Text.Lazy as LT

7572

7673-- | An encoding of a JSON value.

7774--

Data/Aeson/Parser.hs+1−3

@@ -46,9 +46,7 @@ module Data.Aeson.Parser

4646 , eitherDecodeStrictWith

4747 ) where

4848

49−import Data.Aeson.Parser.Internal (decodeStrictWith, decodeWith,

50− eitherDecodeStrictWith, eitherDecodeWith,

51− json, json', jstring, value, value')

49+import Data.Aeson.Parser.Internal (decodeStrictWith, decodeWith, eitherDecodeStrictWith, eitherDecodeWith, json, json', jstring, value, value')

5250

5351-- $lazy

5452--

Data/Aeson/Parser/Internal.hs+1−2

@@ -36,8 +36,7 @@ import Prelude.Compat

3636

3737import Control.Monad.IO.Class (liftIO)

3838import Data.Aeson.Types.Internal (IResult(..), JSONPath, Result(..), Value(..))

39−import Data.Attoparsec.ByteString.Char8 (Parser, char, endOfInput, scientific,

40− skipSpace, string)

39+import Data.Attoparsec.ByteString.Char8 (Parser, char, endOfInput, scientific, skipSpace, string)

4140import Data.Bits ((.|.), shiftL)

4241import Data.ByteString.Internal (ByteString(..))

4342import Data.Char (chr)

Data/Aeson/Parser/Time.hs+1−1

@@ -24,7 +24,7 @@ module Data.Aeson.Parser.Time

2424import Prelude ()

2525import Prelude.Compat

2626

27−import Control.Monad (when, void)

27+import Control.Monad (void, when)

2828import Data.Aeson.Internal.Time (toPico)

2929import Data.Attoparsec.Text as A

3030import Data.Bits ((.&.))

Data/Aeson/TH.hs+37−54

@@ -112,71 +112,54 @@ module Data.Aeson.TH

112112 , mkLiftParseJSON2

113113 ) where

114114

115−import Control.Applicative ( pure, (<$>), (<*>), (<|>) )

116−import Data.Aeson ( Object, (.=), (.:)

117− , ToJSON(..), FromJSON(..)

118− , ToJSON1(..), FromJSON1(..)

119− , ToJSON2(..), FromJSON2(..)

120− )

121−import Data.Aeson.Types ( Value(..), Parser

122− , Options(..)

123− , SumEncoding(..)

124− , defaultOptions

125− , defaultTaggedObject

126− )

127−import Data.Aeson.Types.Internal (Pair, (<?>), JSONPathElement(Key))

115+import Control.Applicative ((<$>), (<*>), (<|>), pure)

116+import Data.Aeson (Object, (.=), (.:), FromJSON(..), FromJSON1(..), FromJSON2(..), ToJSON(..), ToJSON1(..), ToJSON2(..))

117+import Data.Aeson.Types (Options(..), Parser, SumEncoding(..), Value(..), defaultOptions, defaultTaggedObject)

118+import Data.Aeson.Types.Internal ((<?>), Pair, JSONPathElement(Key))

128119import Data.Aeson.Types.FromJSON (parseOptionalFieldWith)

129−import Control.Monad ( fail, liftM2, mapM, return, unless, when )

130−import Data.Bool ( Bool(False, True), otherwise, (&&), not )

131−import Data.Either ( Either(Left, Right) )

132−import Data.Eq ( (==) )

133−import Data.Foldable ( concatMap, foldr' )

134−import Data.Function ( ($), (.), flip )

135−import Data.Functor ( fmap )

136−import Data.Int ( Int )

137−import Data.List ( (++), all, any, find, foldl, foldl'

138− , genericLength , intercalate , intersperse, length, map

139− , partition, union, zip, zip3

140− )

141−import Data.List.NonEmpty ( NonEmpty((:|)), (<|) )

142−import Data.Map ( Map )

143−import Data.Maybe ( Maybe(Nothing, Just), catMaybes, fromMaybe, mapMaybe )

144−import Data.Set ( Set )

145−import Language.Haskell.TH

120+import Control.Monad (fail, liftM2, mapM, return, unless, when)

121+import Data.Bool ((&&), Bool(False, True), otherwise, not )

122+import Data.Either (Either(Left, Right))

123+import Data.Eq ((==))

124+import Data.Foldable (concatMap, foldr')

125+import Data.Function (($), (.), flip)

126+import Data.Functor (fmap)

127+import Data.Int (Int)

128+import Data.List ((++), all, any, find, foldl, foldl', genericLength , intercalate , intersperse, length, map, partition, union, zip, zip3)

129+import Data.List.NonEmpty ((<|), NonEmpty((:|)))

130+import Data.Map (Map)

131+import Data.Maybe (Maybe(Nothing, Just), catMaybes, fromMaybe, mapMaybe)

132+import Data.Set (Set)

146133#if MIN_VERSION_template_haskell(2,8,0)

147− hiding ( Arity )

134+import Language.Haskell.TH hiding (Arity)

135+#else

136+import Language.Haskell.TH

148137#endif

149−import Language.Haskell.TH.Syntax ( VarStrictType )

150−import Prelude ( Enum(..), Eq(..), Integer, Ord(..), String

151− , concat, cycle, drop, elem, error, foldr1, fromIntegral

152− , showChar, showParen, shows, showString, snd, splitAt

153− , take, unzip, zipWith, (-), (||)

154− )

138+import Language.Haskell.TH.Syntax (VarStrictType)

139+import Prelude ((-), (||), Enum(..), Eq(..), Integer, Ord(..), String, concat, cycle, drop, elem, error, foldr1, fromIntegral, showChar, showParen, shows, showString, snd, splitAt, take, unzip, zipWith)

155140#if MIN_VERSION_template_haskell(2,7,0) && !(MIN_VERSION_template_haskell(2,8,0))

156−import Language.Haskell.TH.Lib ( starK )

141+import Language.Haskell.TH.Lib (starK)

157142#endif

158143#if MIN_VERSION_template_haskell(2,8,0) && !(MIN_VERSION_template_haskell(2,10,0))

159−import Data.List ( nub )

160−import Language.Haskell.TH.Syntax ( mkNameG_tc )

161−import Prelude ( uncurry )

144+import Data.List (nub)

145+import Language.Haskell.TH.Syntax (mkNameG_tc)

146+import Prelude (uncurry)

162147#endif

163148#if MIN_VERSION_template_haskell(2,11,0)

164−import Prelude ( head )

149+import Prelude (head)

165150#endif

166−import Text.Printf ( printf )

167−import Text.Show ( show )

151+import Text.Printf (printf)

152+import Text.Show (show)

168153import qualified Data.Aeson as A

169154import qualified Data.Aeson.Encoding.Internal as E

170−import qualified Data.Foldable as F ( all )

171−import qualified Data.HashMap.Strict as H ( lookup, toList )

172−import qualified Data.List.NonEmpty as NE ( drop, length, reverse, splitAt )

173−import qualified Data.Map as M ( fromList, findWithDefault, keys, lookup

174− , singleton, size

175− )

176−import qualified Data.Set as Set ( empty, insert, member )

177−import qualified Data.Text as T ( Text, pack, unpack )

178−import qualified Data.Vector as V ( unsafeIndex, null, length, create, fromList )

179−import qualified Data.Vector.Mutable as VM ( unsafeNew, unsafeWrite )

155+import qualified Data.Foldable as F (all)

156+import qualified Data.HashMap.Strict as H (lookup, toList)

157+import qualified Data.List.NonEmpty as NE (drop, length, reverse, splitAt)

158+import qualified Data.Map as M (fromList, findWithDefault, keys, lookup , singleton, size)

159+import qualified Data.Set as Set (empty, insert, member)

160+import qualified Data.Text as T (Text, pack, unpack)

161+import qualified Data.Vector as V (unsafeIndex, null, length, create, fromList)

162+import qualified Data.Vector.Mutable as VM (unsafeNew, unsafeWrite)

180163

181164

182165--------------------------------------------------------------------------------

Data/Aeson/Text.hs+1−2

@@ -24,7 +24,6 @@ import Data.Monoid ((<>))

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

2525import Data.Text.Lazy.Builder

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

27−

2827import Numeric (showHex)

2928import qualified Data.HashMap.Strict as H

3029import qualified Data.Text as T

@@ -36,7 +35,7 @@ import qualified Data.Vector as V

3635--

3736-- /Note:/ uses 'toEncoding'

3837encodeToLazyText :: ToJSON a => a -> LT.Text

39−encodeToLazyText = LT.decodeUtf8 . encodingToLazyByteString . toEncoding

38+encodeToLazyText = LT.decodeUtf8 . encodingToLazyByteString . toEncoding

4039

4140-- | Encode a JSON 'Value' to a "Data.Text" 'Builder', which can be

4241-- embedded efficiently in a text-based protocol.

Data/Aeson/Types.hs+1−2

@@ -107,10 +107,9 @@ module Data.Aeson.Types

107107import Prelude ()

108108import Prelude.Compat

109109

110+import Data.Aeson.Encoding (Encoding, unsafeToEncoding, fromEncoding, Series, pairs)

110111import Data.Aeson.Types.Class

111112import Data.Aeson.Types.Internal

112−import Data.Aeson.Encoding (Encoding, unsafeToEncoding, fromEncoding, Series, pairs)

113−

114113import Data.Foldable (toList)

115114

116115-- | Encode a 'Foldable' as a JSON array.

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

@@ -84,5 +84,5 @@ module Data.Aeson.Types.Class

8484 ) where

8585

8686import Data.Aeson.Types.FromJSON

87−import Data.Aeson.Types.ToJSON

8887import Data.Aeson.Types.Generic (One, Zero)

88+import Data.Aeson.Types.ToJSON

Data/Aeson/Types/FromJSON.hs+50−56

@@ -67,68 +67,62 @@ module Data.Aeson.Types.FromJSON (

6767 , parseOptionalFieldWith

6868 ) where

6969

70−import Prelude ()

71−import Prelude.Compat hiding (foldr)

70+import Prelude ()

71+import Prelude.Compat

7272

73+import Control.Applicative ((<|>), Const(..))

74+import Control.Monad ((<=<), zipWithM)

7375import Data.Aeson.Internal.Functions (mapKey)

7476import Data.Aeson.Types.Generic

7577import Data.Aeson.Types.Internal

76−

77−import qualified Data.Aeson.Parser.Time as Time

78−import qualified Data.Attoparsec.ByteString.Char8 as A (endOfInput, parseOnly,

79− scientific)

80−

81−import Control.Applicative (Const (..), (<|>))

82−import Control.Monad ((<=<), zipWithM)

83−import Data.Attoparsec.Number (Number (..))

84−import Data.Bits (unsafeShiftR)

85−import Data.Fixed (Fixed, HasResolution)

86−import Data.Functor.Compose (Compose (..))

87−import Data.Functor.Identity (Identity (..))

88−import Data.Functor.Product (Product (..))

89−import Data.Functor.Sum (Sum (..))

90−import Data.Hashable (Hashable (..))

91−import Data.Int (Int16, Int32, Int64, Int8)

92−import Data.List.NonEmpty (NonEmpty (..))

93−import Data.Maybe (fromMaybe)

94−import Data.Monoid (Dual (..), First (..), Last (..), (<>))

95−import Data.Proxy (Proxy (..))

96−import Data.Ratio (Ratio, (%))

97−import Data.Scientific (Scientific)

98−import Data.Tagged (Tagged (..))

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

100−import Data.Time (Day, LocalTime, NominalDiffTime, TimeOfDay,

101− UTCTime, ZonedTime)

102−import Data.Time.Format (parseTime)

103−import Data.Time.Locale.Compat (defaultTimeLocale)

104−import Data.Traversable as Tr (sequence)

105−import Data.Vector (Vector)

106−import Data.Version (Version, parseVersion)

107−import Data.Word (Word16, Word32, Word64, Word8)

108−import Foreign.Storable (Storable)

78+import Data.Attoparsec.Number (Number(..))

79+import Data.Bits (unsafeShiftR)

80+import Data.Fixed (Fixed, HasResolution)

81+import Data.Functor.Compose (Compose(..))

82+import Data.Functor.Identity (Identity(..))

83+import Data.Functor.Product (Product(..))

84+import Data.Functor.Sum (Sum(..))

85+import Data.Hashable (Hashable(..))

86+import Data.Int (Int16, Int32, Int64, Int8)

87+import Data.List.NonEmpty (NonEmpty(..))

88+import Data.Maybe (fromMaybe)

89+import Data.Monoid ((<>), Dual(..), First (..), Last (..))

90+import Data.Proxy (Proxy(..))

91+import Data.Ratio ((%), Ratio)

92+import Data.Scientific (Scientific)

93+import Data.Tagged (Tagged(..))

94+import Data.Text (Text, pack, unpack)

95+import Data.Time (Day, LocalTime, NominalDiffTime, TimeOfDay, UTCTime, ZonedTime)

96+import Data.Time.Format (parseTime)

97+import Data.Time.Locale.Compat (defaultTimeLocale)

98+import Data.Traversable as Tr (sequence)

99+import Data.Vector (Vector)

100+import Data.Version (Version, parseVersion)

101+import Data.Word (Word16, Word32, Word64, Word8)

102+import Foreign.Storable (Storable)

109103import GHC.Generics

110−import Numeric.Natural (Natural)

104+import Numeric.Natural (Natural)

111105import Text.ParserCombinators.ReadP (readP_to_S)

112−

113−import qualified Data.DList as DList

114−import qualified Data.HashMap.Strict as H

115−import qualified Data.HashSet as HashSet

116−import qualified Data.IntMap as IntMap

117−import qualified Data.IntSet as IntSet

118−import qualified Data.Map as M

119−import qualified Data.Scientific as Scientific

120−import qualified Data.Sequence as Seq

121−import qualified Data.Set as Set

122−import qualified Data.Text as T

123−import qualified Data.Text.Encoding as T

124−import qualified Data.Text.Lazy as LT

125−import qualified Data.Tree as Tree

126−import qualified Data.Vector as V

127−import qualified Data.Vector.Generic as VG

106+import qualified Data.Aeson.Parser.Time as Time

107+import qualified Data.Attoparsec.ByteString.Char8 as A (endOfInput, parseOnly, scientific)

108+import qualified Data.DList as DList

109+import qualified Data.HashMap.Strict as H

110+import qualified Data.HashSet as HashSet

111+import qualified Data.IntMap as IntMap

112+import qualified Data.IntSet as IntSet

113+import qualified Data.Map as M

114+import qualified Data.Scientific as Scientific

115+import qualified Data.Sequence as Seq

116+import qualified Data.Set as Set

117+import qualified Data.Text as T

118+import qualified Data.Text.Encoding as T

119+import qualified Data.Text.Lazy as LT

120+import qualified Data.Tree as Tree

121+import qualified Data.Vector as V

122+import qualified Data.Vector.Generic as VG

128123import qualified Data.Vector.Primitive as VP

129−import qualified Data.Vector.Storable as VS

130−import qualified Data.Vector.Unboxed as VU

131−

124+import qualified Data.Vector.Storable as VS

125+import qualified Data.Vector.Unboxed as VU

132126import Unsafe.Coerce (unsafeCoerce)

133127

134128#ifndef HAS_COERCIBLE

@@ -1184,7 +1178,7 @@ instance FromJSON Int where

11841178 {-# INLINE parseJSON #-}

11851179

11861180instance FromJSONKey Int where

1187− fromJSONKey = FromJSONKeyTextParser $ parseBoundedIntegralText "Int"

1181+ fromJSONKey = FromJSONKeyTextParser $ parseBoundedIntegralText "Int"

11881182

11891183-- | /WARNING:/ Only parse Integers from trusted input since an

11901184-- attacker could easily fill up the memory of the target system by

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

@@ -63,24 +63,24 @@ module Data.Aeson.Types.Internal

6363import Prelude ()

6464import Prelude.Compat

6565

66−import Control.Arrow (first)

6766import Control.Applicative (Alternative(..))

67+import Control.Arrow (first)

6868import Control.DeepSeq (NFData(..))

6969import Control.Monad (MonadPlus(..), ap)

70−import qualified Control.Monad.Fail as Fail

7170import Data.Char (isLower, isUpper, toLower, isAlpha, isAlphaNum)

7271import Data.Data (Data)

7372import Data.Foldable (foldl')

7473import Data.HashMap.Strict (HashMap)

7574import Data.Hashable (Hashable(..))

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

7775import Data.Scientific (Scientific)

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

7877import Data.String (IsString(..))

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

8079import Data.Time (UTCTime)

8180import Data.Time.Format (FormatTime)

8281import Data.Typeable (Typeable)

8382import Data.Vector (Vector)

83+import qualified Control.Monad.Fail as Fail

8484import qualified Data.HashMap.Strict as H

8585import qualified Data.Scientific as S

8686import qualified Data.Vector as V

Data/Aeson/Types/ToJSON.hs+55−61

@@ -55,78 +55,72 @@ module Data.Aeson.Types.ToJSON (

5555 , listValue

5656 ) where

5757

58−import Prelude ()

58+import Prelude ()

5959import Prelude.Compat

6060

61−import Data.Aeson.Encoding.Internal (Encoding, Encoding', Series, dict,

62− emptyArray_, tuple, (>*<), (><))

61+import Control.Applicative (Const(..))

62+import Control.Monad.ST (ST)

63+import Data.Aeson.Encoding.Internal ((>*<), (><), Encoding, Encoding', Series, dict, emptyArray_, tuple)

6364import Data.Aeson.Internal.Functions (mapHashKeyVal, mapKeyVal)

6465import Data.Aeson.Types.Generic

6566import Data.Aeson.Types.Internal

66−

67−-- We need internal here for generic deriving

68−import qualified Data.Aeson.Encoding.Internal as E

69−

70−import Control.Applicative (Const (..))

71−import Control.Monad.ST (ST)

72−import Data.Attoparsec.Number (Number (..))

73−import Data.Bits (unsafeShiftR)

74−import Data.DList (DList)

75−import Data.Fixed (Fixed, HasResolution)

76−import Data.Foldable (toList)

77−import Data.Functor.Compose (Compose (..))

78−import Data.Functor.Identity (Identity (..))

79−import Data.Functor.Product (Product (..))

80−import Data.Functor.Sum (Sum (..))

81−import Data.Int (Int16, Int32, Int64, Int8)

82−import Data.List (intersperse)

83−import Data.List.NonEmpty (NonEmpty (..))

84−import Data.Monoid (Dual (..), First (..), Last (..), (<>))

85−import Data.Proxy (Proxy (..))

86−import Data.Ratio (Ratio, denominator, numerator)

87−import Data.Scientific (Scientific)

88−import Data.Tagged (Tagged (..))

89−import Data.Text (Text, pack)

90−import Data.Time (Day, LocalTime, NominalDiffTime, TimeOfDay,

91− UTCTime, ZonedTime)

92−import Data.Time.Format (FormatTime, formatTime)

67+import Data.Attoparsec.Number (Number(..))

68+import Data.Bits (unsafeShiftR)

69+import Data.DList (DList)

70+import Data.Fixed (Fixed, HasResolution)

71+import Data.Foldable (toList)

72+import Data.Functor.Compose (Compose(..))

73+import Data.Functor.Identity (Identity(..))

74+import Data.Functor.Product (Product(..))

75+import Data.Functor.Sum (Sum(..))

76+import Data.Int (Int16, Int32, Int64, Int8)

77+import Data.List (intersperse)

78+import Data.List.NonEmpty (NonEmpty(..))

79+import Data.Monoid ((<>), Dual(..), First(..), Last(..))

80+import Data.Proxy (Proxy(..))

81+import Data.Ratio (Ratio, denominator, numerator)

82+import Data.Scientific (Scientific)

83+import Data.Tagged (Tagged(..))

84+import Data.Text (Text, pack)

85+import Data.Time (Day, LocalTime, NominalDiffTime, TimeOfDay, UTCTime, ZonedTime)

86+import Data.Time.Format (FormatTime, formatTime)

9387import Data.Time.Locale.Compat (defaultTimeLocale)

94−import Data.Vector (Vector)

95−import Data.Version (Version, showVersion)

96−import Data.Word (Word16, Word32, Word64, Word8)

97−import Foreign.Storable (Storable)

88+import Data.Vector (Vector)

89+import Data.Version (Version, showVersion)

90+import Data.Word (Word16, Word32, Word64, Word8)

91+import Foreign.Storable (Storable)

9892import GHC.Generics

99−import Numeric.Natural (Natural)

100−

101−import qualified Data.ByteString as S

102−import qualified Data.ByteString.Lazy as L

103−import qualified Data.DList as DList

104−import qualified Data.HashMap.Strict as H

105−import qualified Data.HashSet as HashSet

106−import qualified Data.IntMap as IntMap

107−import qualified Data.IntSet as IntSet

108−import qualified Data.List.NonEmpty as NE

109−import qualified Data.Map as M

110−import qualified Data.Scientific as Scientific

111−import qualified Data.Sequence as Seq

112−import qualified Data.Set as Set

113−import qualified Data.Text as T

114−import qualified Data.Text.Encoding as T

115−import qualified Data.Text.Lazy as LT

116−import qualified Data.Tree as Tree

117−import qualified Data.Vector as V

118−import qualified Data.Vector.Generic as VG

119−import qualified Data.Vector.Mutable as VM

93+import Numeric.Natural (Natural)

94+-- We need internal here for generic deriving

95+import qualified Data.Aeson.Encoding.Internal as E

96+import qualified Data.ByteString as S

97+import qualified Data.ByteString.Lazy as L

98+import qualified Data.DList as DList

99+import qualified Data.HashMap.Strict as H

100+import qualified Data.HashSet as HashSet

101+import qualified Data.IntMap as IntMap

102+import qualified Data.IntSet as IntSet

103+import qualified Data.List.NonEmpty as NE

104+import qualified Data.Map as M

105+import qualified Data.Scientific as Scientific

106+import qualified Data.Sequence as Seq

107+import qualified Data.Set as Set

108+import qualified Data.Text as T

109+import qualified Data.Text.Encoding as T

110+import qualified Data.Text.Lazy as LT

111+import qualified Data.Tree as Tree

112+import qualified Data.Vector as V

113+import qualified Data.Vector.Generic as VG

114+import qualified Data.Vector.Mutable as VM

120115import qualified Data.Vector.Primitive as VP

121−import qualified Data.Vector.Storable as VS

122−import qualified Data.Vector.Unboxed as VU

116+import qualified Data.Vector.Storable as VS

117+import qualified Data.Vector.Unboxed as VU

123118

124119#if !(MIN_VERSION_bytestring(0,10,0))

125−import Foreign.ForeignPtr (withForeignPtr)

120+import Foreign.ForeignPtr (withForeignPtr)

126121import Foreign.Marshal.Utils (copyBytes)

127−import Foreign.Ptr (plusPtr)

128−

129−import qualified Data.ByteString.Internal as S

122+import Foreign.Ptr (plusPtr)

123+import qualified Data.ByteString.Internal as S

130124import qualified Data.ByteString.Lazy.Internal as L

131125#endif

132126