Merge pull request haskell#1034 from haskell/issue-993-internal-modules

Resolve haskell#993: Remove Data.Aeson.Internal and .Time modules
albertodvp · Jun 9, 2023 · 14d796e · 14d796e
2 parents 17f8946 + ca8f7f3
commit 14d796e
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 55 deletions.
diff --git a/aeson.cabal b/aeson.cabal
@@ -63,8 +63,6 @@ library
     Data.Aeson.Decoding.Tokens
     Data.Aeson.Encoding
     Data.Aeson.Encoding.Internal
-    Data.Aeson.Internal
-    Data.Aeson.Internal.Time
     Data.Aeson.Key
     Data.Aeson.KeyMap
     Data.Aeson.Parser

diff --git a/src/Data/Aeson.hs b/src/Data/Aeson.hs
@@ -160,11 +160,10 @@ module Data.Aeson
 
 import Control.Exception (Exception (..))
 import Control.Monad.Catch (MonadThrow (..))
-import Data.Aeson.Types.FromJSON (ifromJSON, parseIndexedJSON)
+import Data.Aeson.Types.FromJSON (parseIndexedJSON)
 import Data.Aeson.Encoding (encodingToLazyByteString)
 import Data.Aeson.Parser.Internal (decodeWith, decodeStrictWith, eitherDecodeWith, eitherDecodeStrictWith, jsonEOF, json, jsonEOF', json')
 import Data.Aeson.Types
-import Data.Aeson.Types.Internal (formatError)
 import qualified Data.ByteString as B
 import qualified Data.ByteString.Lazy as L
 

diff --git a/src/Data/Aeson/Internal.hs b/src/Data/Aeson/Internal.hs
diff --git a/src/Data/Aeson/Internal/Time.hs b/src/Data/Aeson/Internal/Time.hs
diff --git a/tests/UnitTests/NullaryConstructors.hs b/tests/UnitTests/NullaryConstructors.hs
@@ -11,8 +11,7 @@ module UnitTests.NullaryConstructors
 import Prelude.Compat
 
 import Data.Aeson (decode, eitherDecode, fromEncoding, Value)
-import Data.Aeson.Internal (IResult (..), iparse)
-import Data.Aeson.Types (Parser)
+import Data.Aeson.Types (Parser, IResult (..), iparse)
 import Data.ByteString.Builder (toLazyByteString)
 import Data.Foldable (for_)
 import Data.Maybe (fromJust)