9666888 · typeable/aeson

git.iko.soy/typeable/aeson

Import fixes

commit96668882fad49b325f934c13e0fb86109ae2ade2 authorAdam Bergmark <adam@bergmark.nl> dateSat 30 Jul 2016, 16:23 (10 years ago) parent928c603

3 files changed+6−9

compare with master

unifiedsplit

Data/Aeson/TH.hs−5 Data/Aeson/Types/Generic.hs+1−1 Data/Aeson/Types/ToJSON.hs+5−3

Data/Aeson/TH.hs−5

@@ -141,12 +141,7 @@ import Language.Haskell.TH.Syntax (VarStrictType)

141141import Language.Haskell.TH.Lib (starK)

142142#endif

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

144−import Data.List (nub)

145144import Language.Haskell.TH.Syntax (mkNameG_tc)

146−import Prelude (uncurry)

147−#endif

148−#if MIN_VERSION_template_haskell(2,11,0)

149−import Prelude (head)

150145#endif

151146import Text.Printf (printf)

152147import qualified Data.Aeson as A

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

@@ -26,7 +26,7 @@

2626module Data.Aeson.Types.Generic

2727 (

2828 IsRecord(..)

29− , AllNullary(..)

29+ , AllNullary

3030 , Tagged2(..)

3131 , True

3232 , False

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

@@ -61,9 +61,10 @@ import Prelude.Compat

6161

6262import Control.Applicative (Const(..))

6363import Control.Monad.ST (ST)

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

64+import Data.Aeson.Encoding (Encoding, Encoding', Series, dict, emptyArray_)

65+import Data.Aeson.Encoding.Internal ((>*<), (><), tuple)

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

66−import Data.Aeson.Types.Generic

67+import Data.Aeson.Types.Generic (AllNullary, False, IsRecord(..), One, ProductSize, Tagged2(..), True, Zero, productSize)

6768import Data.Aeson.Types.Internal

6869import Data.Attoparsec.Number (Number(..))

6970import Data.Bits (unsafeShiftR)

@@ -92,8 +93,9 @@ import Data.Word (Word16, Word32, Word64, Word8)

9293import Foreign.Storable (Storable)

9394import GHC.Generics

9495import Numeric.Natural (Natural)

96+import qualified Data.Aeson.Encoding as E

9597-- We need internal here for generic deriving

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

98+import qualified Data.Aeson.Encoding.Internal as E (InArray, closeCurly, colon, comma, econcat, empty, openCurly, retagEncoding, tuple, wrapObject)

9799import qualified Data.ByteString as S

98100import qualified Data.ByteString.Lazy as L

99101import qualified Data.DList as DList