git.iko.soy/typeable/aeson
on master help sign in
A few little cleanups
0165b2cBryan O'Sullivan
Data/Aeson/Types/Generic.hs+10−17
compare with master
unifiedsplit
@@ -1,20 +1,13 @@
1−{-# LANGUAGE DefaultSignatures
1+{-# LANGUAGE DefaultSignatures, EmptyDataDecls, FlexibleInstances,
2− , EmptyDataDecls
3− , FlexibleInstances
4− , FunctionalDependencies
2+ FunctionalDependencies, KindSignatures, OverlappingInstances,
5− , KindSignatures
6− , OverlappingInstances
7− , ScopedTypeVariables
8− , TypeOperators
9− , UndecidableInstances
3+ ScopedTypeVariables, TypeOperators, UndecidableInstances, ViewPatterns #-}
10− , ViewPatterns
11− #-}
12−
13{-# OPTIONS_GHC -fno-warn-orphans #-}
4{-# OPTIONS_GHC -fno-warn-orphans #-}
14
5
15-- |
6-- |
16-- Module: Data.Aeson.Types.Generic
7-- Module: Data.Aeson.Types.Generic
8+-- Copyright: (c) 2012 Bryan O'Sullivan
9+-- (c) 2011 Bas Van Dijk
17−-- Copyright: (c) 2011 MailRank, Inc.
10+-- (c) 2011 MailRank, Inc.
18-- License: Apache
11-- License: Apache
19-- Maintainer: Bryan O'Sullivan <bos@serpentine.com>
12-- Maintainer: Bryan O'Sullivan <bos@serpentine.com>
20-- Stability: experimental
13-- Stability: experimental
@@ -24,15 +17,15 @@
24
17
25module Data.Aeson.Types.Generic ( ) where
18module Data.Aeson.Types.Generic ( ) where
26
19
27−import Control.Applicative
20+import Control.Applicative ((<*>), (<$>), (<|>), pure)
28−import Data.Bits (shiftR)
21+import Control.Monad.ST (ST)
29import Data.Aeson.Types.Class
22import Data.Aeson.Types.Class
30import Data.Aeson.Types.Internal
23import Data.Aeson.Types.Internal
31−import Data.Text (pack, unpack)
24+import Data.Bits (shiftR)
32import Data.DList (DList, toList)
25import Data.DList (DList, toList)
33import Data.Monoid (mappend)
26import Data.Monoid (mappend)
27+import Data.Text (pack, unpack)
34import GHC.Generics
28import GHC.Generics
35−import Control.Monad.ST (ST)
36import qualified Data.HashMap.Strict as H
29import qualified Data.HashMap.Strict as H
37import qualified Data.Text as T
30import qualified Data.Text as T
38import qualified Data.Vector as V
31import qualified Data.Vector as V