69ef475 · typeable/openapi3

git.iko.soy/typeable/openapi3

Merge pull request #125 from phadej/explicit-aeson-imports

Explicit aeson imports

commit69ef4752613c05239b92103f5e97f9dee23c6630 authorOleg Grenrus <oleg.grenrus@iki.fi> dateThu 21 Sep 2017, 23:11 (9 years ago) parent5ec8bd7 081d0d4

5 files changed+9−4

compare with master

unifiedsplit

src/Data/Swagger/Internal/ParamSchema.hs+3−1 src/Data/Swagger/Internal/Schema.hs+2−1 stack.yaml+2 test/Data/Swagger/ParamSchemaSpec.hs+1−1 test/Data/Swagger/SchemaSpec.hs+1−1

src/Data/Swagger/Internal/ParamSchema.hs+3−1

@@ -22,7 +22,7 @@

2222module Data.Swagger.Internal.ParamSchema where

2323

2424import Control.Lens

25−import Data.Aeson

25+import Data.Aeson (ToJSON (..))

2626import Data.Proxy

2727import GHC.Generics

2828

@@ -315,3 +315,5 @@ instance Constructor c => GEnumParamSchema (C1 c U1) where

315315

316316data Proxy3 a b c = Proxy3

317317

318+-- $setup

319+-- >>> import Data.Aeson (encode)

src/Data/Swagger/Internal/Schema.hs+2−1

@@ -32,7 +32,7 @@ import Data.Data.Lens (template)

3232

3333import Control.Monad

3434import Control.Monad.Writer

35−import Data.Aeson

35+import Data.Aeson (ToJSON (..), ToJSONKey (..), ToJSONKeyFunction (..), Value (..))

3636import Data.Char

3737import Data.Data (Data)

3838import Data.Foldable (traverse_)

@@ -796,3 +796,4 @@ data Proxy3 a b c = Proxy3

796796

797797-- $setup

798798-- >>> import Data.Swagger

799+-- >>> import Data.Aeson (encode)

stack.yaml+2

@@ -1,3 +1,5 @@

11resolver: lts-9.3

22packages:

33- '.'

4+extra-deps:

5+- aeson-1.2.2.0

test/Data/Swagger/ParamSchemaSpec.hs+1−1

@@ -5,7 +5,7 @@

55{-# LANGUAGE QuasiQuotes #-}

66module Data.Swagger.ParamSchemaSpec where

8−import Data.Aeson

8+import Data.Aeson (Value)

99import Data.Aeson.QQ

1010import Data.Char

1111import Data.Proxy

test/Data/Swagger/SchemaSpec.hs+1−1

@@ -8,7 +8,7 @@ import Prelude ()

88import Prelude.Compat

1010import Control.Lens ((^.))

11−import Data.Aeson

11+import Data.Aeson (Value)

1212import Data.Aeson.QQ

1313import Data.Char

1414import qualified Data.HashMap.Strict.InsOrd as InsOrdHashMap