git.iko.soy/typeable/aeson
on master help sign in
Sort imports
commit1c25679039513c3ff069fe1afd5b5ee99a967378 authorBryan O'Sullivan <bos@serpentine.com> dateWed 22 Jul 2015, 22:05 (11 years ago) parente9e983c
6 files changed+33−43
compare with master
unifiedsplit
Data/Aeson.hs+1−1 Data/Aeson/Parser/Internal.hs+2−2 Data/Aeson/TH.hs+8−18 Data/Aeson/Types/Generic.hs+4−4 Data/Aeson/Types/Instances.hs+12−12 Data/Aeson/Types/Internal.hs+6−6
Data/Aeson.hs+1−1
@@ -90,8 +90,8 @@ import Data.Aeson.Parser.Internal (decodeWith, decodeStrictWith,
9090 eitherDecodeWith, eitherDecodeStrictWith,
9191 jsonEOF, json, jsonEOF', json')
9292import Data.Aeson.Types
93−import Data.Aeson.Types.Internal (JSONPath, formatError)
9493import Data.Aeson.Types.Instances (ifromJSON)
94+import Data.Aeson.Types.Internal (JSONPath, formatError)
9595import qualified Data.ByteString as B
9696import qualified Data.ByteString.Lazy as L
9797
Data/Aeson/Parser/Internal.hs+2−2
@@ -46,16 +46,16 @@ import Data.Text.Internal.Unsafe.Char (ord)
4646import Data.Vector as Vector (Vector, empty, fromList, reverse)
4747import Data.Word (Word8)
4848import Foreign.ForeignPtr (withForeignPtr)
49−import Foreign.Ptr (minusPtr)
5049import Foreign.Ptr (Ptr, plusPtr)
50+import Foreign.Ptr (minusPtr)
5151import Foreign.Storable (poke)
5252import System.IO.Unsafe (unsafePerformIO)
5353import qualified Data.Attoparsec.ByteString as A
5454import qualified Data.Attoparsec.Lazy as L
5555import qualified Data.Attoparsec.Zepto as Z
5656import qualified Data.ByteString as B
57−import qualified Data.ByteString.Lazy as L
5857import qualified Data.ByteString.Internal as B
58+import qualified Data.ByteString.Lazy as L
5959import qualified Data.ByteString.Unsafe as B
6060import qualified Data.HashMap.Strict as H
6161
Data/Aeson/TH.hs+8−18
@@ -73,11 +73,8 @@ module Data.Aeson.TH
7373 , mkParseJSON
7474 ) where
7575
76−--------------------------------------------------------------------------------
77−-- Imports
78−--------------------------------------------------------------------------------
79−
80−-- from aeson:
76+import Control.Applicative ( pure, (<$>), (<*>) )
77+import Control.Monad ( return, mapM, liftM2, fail )
8178import Data.Aeson ( toJSON, Object, (.=), (.:), (.:?)
8279 , ToJSON, toEncoding, toJSON
8380 , FromJSON, parseJSON
@@ -89,34 +86,27 @@ import Data.Aeson.Types ( Value(..), Parser
8986 , defaultTaggedObject
9087 )
9188import Data.Aeson.Types.Internal (Encoding(..))
92−import qualified Data.Aeson.Encode.Builder as E
93−import qualified Data.Aeson.Encode.Functions as E
94−import qualified Data.Aeson as A
95−-- from base:
96−import Control.Applicative ( pure, (<$>), (<*>) )
97−import Control.Monad ( return, mapM, liftM2, fail )
9889import Data.Bool ( Bool(False, True), otherwise, (&&) , not)
90+import Data.Either ( Either(Left, Right) )
9991import Data.Eq ( (==) )
10092import Data.Function ( ($), (.) )
10193import Data.Functor ( fmap )
10294import Data.Int ( Int )
103−import Data.Either ( Either(Left, Right) )
10495import Data.List ( (++), foldl, foldl', intercalate, intersperse
10596 , length, map, zip, genericLength, all, partition
10697 )
10798import Data.Maybe ( Maybe(Nothing, Just), catMaybes )
10899import Data.Monoid ( (<>), mconcat )
100+import Language.Haskell.TH
101+import Language.Haskell.TH.Syntax ( VarStrictType )
109102import Prelude ( String, (-), Integer, error, foldr1, fromIntegral )
110103import Text.Printf ( printf )
111104import Text.Show ( show )
112−-- from unordered-containers:
105+import qualified Data.Aeson as A
106+import qualified Data.Aeson.Encode.Builder as E
107+import qualified Data.Aeson.Encode.Functions as E
113108import qualified Data.HashMap.Strict as H ( lookup, toList )
114−-- from template-haskell:
115−import Language.Haskell.TH
116−import Language.Haskell.TH.Syntax ( VarStrictType )
117−-- from text:
118109import qualified Data.Text as T ( Text, pack, unpack )
119−-- from vector:
120110import qualified Data.Vector as V ( unsafeIndex, null, length, create, fromList )
121111import qualified Data.Vector.Mutable as VM ( unsafeNew, unsafeWrite )
122112
Data/Aeson/Types/Generic.hs+4−4
@@ -22,15 +22,15 @@ module Data.Aeson.Types.Generic ( ) where
2222import Control.Applicative ((<*>), (<$>), (<|>), pure)
2323import Control.Monad ((<=<))
2424import Control.Monad.ST (ST)
25−import Data.Aeson.Types.Instances
26−import Data.Aeson.Types.Internal
27−import Data.Bits
2825import Data.Aeson.Encode.Builder (emptyArray_)
2926import Data.Aeson.Encode.Functions (builder)
27+import Data.Aeson.Types.Instances
28+import Data.Aeson.Types.Internal
29+import Data.Bits (unsafeShiftR)
3030import Data.ByteString.Builder as B
31−import Data.Monoid ((<>), mempty)
3231import Data.DList (DList, toList, empty)
3332import Data.Maybe (fromMaybe)
33+import Data.Monoid ((<>), mempty)
3434import Data.Text (Text, pack, unpack)
3535import GHC.Generics
3636import qualified Data.HashMap.Strict as H
Data/Aeson/Types/Instances.hs+12−12
@@ -56,26 +56,21 @@ module Data.Aeson.Types.Instances
5656 ) where
5757
5858import Control.Applicative ((<$>), (<*>), pure)
59−import qualified Data.Aeson.Encode.Builder as E
60−import qualified Data.ByteString.Builder as B
61−import qualified Data.ByteString.Lazy as L
62−import Data.Aeson.Functions
63−import Data.Monoid ((<>), mempty)
6459import Data.Aeson.Encode.Functions (brackets, builder, encode, foldable, list)
65−import qualified Data.Aeson.Parser.Time as Time
60+import Data.Aeson.Functions (hashMapKey, mapHashKeyVal, mapKey, mapKeyVal)
6661import Data.Aeson.Types.Class
6762import Data.Aeson.Types.Internal
68−import Data.Scientific (Scientific)
69−import qualified Data.Scientific as Scientific (coefficient, base10Exponent, fromFloatDigits, toRealFloat)
7063import Data.Attoparsec.Number (Number(..))
71−import Data.Fixed
64+import Data.Fixed (Fixed, HasResolution)
7265import Data.Foldable (Foldable, toList)
7366import Data.Functor.Identity (Identity(..))
7467import Data.Hashable (Hashable(..))
7568import Data.Int (Int8, Int16, Int32, Int64)
7669import Data.Maybe (fromMaybe)
70+import Data.Monoid ((<>), mempty)
7771import Data.Monoid (Dual(..), First(..), Last(..))
7872import Data.Ratio (Ratio, (%), numerator, denominator)
73+import Data.Scientific (Scientific)
7974import Data.Text (Text, pack, unpack)
8075import Data.Time (Day, LocalTime, UTCTime, ZonedTime)
8176import Data.Time.Format (FormatTime, formatTime, parseTime)
@@ -84,23 +79,28 @@ import Data.Vector (Vector)
8479import Data.Word (Word, Word8, Word16, Word32, Word64)
8580import Foreign.Storable (Storable)
8681import Prelude hiding (foldr)
82+import qualified Data.Aeson.Encode.Builder as E
83+import qualified Data.Aeson.Parser.Time as Time
84+import qualified Data.ByteString.Builder as B
85+import qualified Data.ByteString.Lazy as L
8786import qualified Data.HashMap.Strict as H
8887import qualified Data.HashSet as HashSet
8988import qualified Data.IntMap as IntMap
9089import qualified Data.IntSet as IntSet
9190import qualified Data.Map as M
92−import qualified Data.Set as Set
91+import qualified Data.Scientific as Scientific
9392import qualified Data.Sequence as Seq
94−import qualified Data.Tree as Tree
93+import qualified Data.Set as Set
9594import qualified Data.Text as T
9695import qualified Data.Text.Encoding as T
9796import qualified Data.Text.Lazy as LT
97+import qualified Data.Tree as Tree
9898import qualified Data.Vector as V
9999import qualified Data.Vector.Generic as VG
100+import qualified Data.Vector.Mutable as VM (unsafeNew, unsafeWrite)
100101import qualified Data.Vector.Primitive as VP
101102import qualified Data.Vector.Storable as VS
102103import qualified Data.Vector.Unboxed as VU
103−import qualified Data.Vector.Mutable as VM ( unsafeNew, unsafeWrite )
104104
105105#if MIN_VERSION_time(1,5,0)
106106import Data.Time.Format (defaultTimeLocale)
Data/Aeson/Types/Internal.hs+6−6
@@ -53,17 +53,17 @@ module Data.Aeson.Types.Internal
5353 , DotNetTime(..)
5454 ) where
5555
56−import Control.Applicative
57−import Control.Monad
56+import Control.Applicative (Alternative(..))
5857import Control.DeepSeq (NFData(..))
58+import Control.Monad (MonadPlus(..), ap)
5959import Data.ByteString.Builder (Builder, char7, toLazyByteString)
60−import Data.Char (toLower, isUpper, isLower)
61−import Data.Scientific (Scientific)
62−import Data.Foldable (Foldable(..))
63−import Data.Hashable (Hashable(..))
60+import Data.Char (isLower, isUpper, toLower)
6461import Data.Data (Data)
62+import Data.Foldable (Foldable(..))
6563import Data.HashMap.Strict (HashMap)
64+import Data.Hashable (Hashable(..))
6665import Data.Monoid (Monoid(..), (<>))
66+import Data.Scientific (Scientific)
6767import Data.String (IsString(..))
6868import Data.Text (Text, pack, unpack)
6969import Data.Time (UTCTime)