a77d5f7 · typeable/aeson

git.iko.soy/typeable/aeson

Correct *Key exports

commita77d5f7604f1747f5ce33c7e2ffb02331add1899 authorOleg Grenrus <oleg.grenrus@iki.fi> dateWed 25 May 2016, 10:00 (10 years ago) parent0130913

3 files changed+17−5

compare with master

unifiedsplit

Data/Aeson.hs+5 Data/Aeson/Types.hs+6 Data/Aeson/Types/Instances.hs+6−5

Data/Aeson.hs+5

@@ -57,6 +57,11 @@ module Data.Aeson

5757 , fromJSON

5858 , ToJSON(..)

5959 , KeyValue(..)

60+ -- ** Keys for maps

61+ , ToJSONKey(..)

62+ , ToJSONKeyFunction(..)

63+ , FromJSONKey(..)

64+ , FromJSONKeyFunction(..)

6065 -- ** Generic JSON classes and options

6166 , GFromJSON(..)

6267 , GToJSON(..)

Data/Aeson/Types.hs+6

@@ -37,6 +37,12 @@ module Data.Aeson.Types

3737 , KeyValue(..)

3838 , modifyFailure

3939

40+ -- ** Keys for maps

41+ , ToJSONKey(..)

42+ , ToJSONKeyFunction(..)

43+ , FromJSONKey(..)

44+ , FromJSONKeyFunction(..)

45+

4046 -- ** Generic JSON classes

4147 , GFromJSON(..)

4248 , GToJSON(..)

Data/Aeson/Types/Instances.hs+6−5

@@ -35,6 +35,11 @@ module Data.Aeson.Types.Instances

3535 FromJSON(..)

3636 , ToJSON(..)

3737 , KeyValue(..)

38+ -- ** Keys for maps

39+ , ToJSONKey(..)

40+ , ToJSONKeyFunction(..)

41+ , FromJSONKey(..)

42+ , FromJSONKeyFunction(..)

3843 -- ** Generic JSON classes

3944 , GFromJSON(..)

4045 , GToJSON(..)

@@ -64,15 +69,11 @@ module Data.Aeson.Types.Instances

6469 , tuple

6570 , (>*<)

6671 , typeMismatch

67−

68− -- * Keys for maps

69− , ToJSONKey(..)

70− , FromJSONKey(..)

7172 ) where

7273

7374import Control.Applicative (Const(..))

7475import Data.Aeson.Encode.Functions (brackets, builder, encode, foldable, list, list')

75−import Data.Aeson.Functions (hashMapKey, mapHashKeyVal, mapKey, mapKeyVal)

76+import Data.Aeson.Functions (mapHashKeyVal, mapKey, mapKeyVal)

7677import Data.Aeson.Types.Class

7778import Data.Aeson.Types.Internal

7879import Data.Attoparsec.Number (Number(..))