Merge pull request #413 from phadej/no-orphans

Un-orphan instances

Author: bergmark

Data/Aeson.hs

@@ -103,12 +103,12 @@ module Data.Aeson
     , json'
     ) where
 
+import Data.Aeson.Types.FromJSON (ifromJSON)
 import Data.Aeson.Encode (encode)
 import Data.Aeson.Parser.Internal (decodeWith, decodeStrictWith,
                                    eitherDecodeWith, eitherDecodeStrictWith,
                                    jsonEOF, json, jsonEOF', json')
 import Data.Aeson.Types
-import Data.Aeson.Types.Instances (ifromJSON)
 import Data.Aeson.Types.Internal (JSONPath, formatError)
 import qualified Data.ByteString as B
 import qualified Data.ByteString.Lazy as L

Data/Aeson/Encode/Functions.hs

@@ -10,6 +10,5 @@ import Data.Aeson.Types.Class
 import Data.ByteString.Builder (Builder)
 import Data.Monoid ((<>))
 
-builder :: ToJSON a => a -> Builder
-builder = fromEncoding . toEncoding
+
 {-# INLINE builder #-}

Data/Aeson/Internal.hs

@@ -22,5 +22,5 @@ module Data.Aeson.Internal
     , iparse
     ) where
 
-import Data.Aeson.Types.Instances (ifromJSON)
 import Data.Aeson.Types.Internal
+import Data.Aeson.Types.FromJSON (ifromJSON)

Data/Aeson/Types.hs

@@ -94,12 +94,14 @@ module Data.Aeson.Types
     , defaultTaggedObject
     ) where
 
-import Data.Aeson.Types.Generic ()
-import Data.Aeson.Types.Instances
+import Prelude ()
+import Prelude.Compat
+
+import Data.Aeson.Types.Class
 import Data.Aeson.Types.Internal
 import Data.Aeson.Encoding (Encoding, unsafeToEncoding, fromEncoding, Series, pairs)
 
-import Data.Foldable (Foldable, toList)
+import Data.Foldable (toList)
 
 -- | Encode a 'Foldable' as a JSON array.
 foldable :: (Foldable t, ToJSON a) => t a -> Encoding