Skip to content

Commit

Permalink
Merge pull request #125 from phadej/explicit-aeson-imports
Browse files Browse the repository at this point in the history
Explicit aeson imports
  • Loading branch information
phadej authored Sep 21, 2017
2 parents 5ec8bd7 + 081d0d4 commit 69ef475
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 4 deletions.
4 changes: 3 additions & 1 deletion src/Data/Swagger/Internal/ParamSchema.hs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
module Data.Swagger.Internal.ParamSchema where

import Control.Lens
import Data.Aeson
import Data.Aeson (ToJSON (..))
import Data.Proxy
import GHC.Generics

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

data Proxy3 a b c = Proxy3

-- $setup
-- >>> import Data.Aeson (encode)
3 changes: 2 additions & 1 deletion src/Data/Swagger/Internal/Schema.hs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import Data.Data.Lens (template)

import Control.Monad
import Control.Monad.Writer
import Data.Aeson
import Data.Aeson (ToJSON (..), ToJSONKey (..), ToJSONKeyFunction (..), Value (..))
import Data.Char
import Data.Data (Data)
import Data.Foldable (traverse_)
Expand Down Expand Up @@ -796,3 +796,4 @@ data Proxy3 a b c = Proxy3

-- $setup
-- >>> import Data.Swagger
-- >>> import Data.Aeson (encode)
2 changes: 2 additions & 0 deletions stack.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
resolver: lts-9.3
packages:
- '.'
extra-deps:
- aeson-1.2.2.0
2 changes: 1 addition & 1 deletion test/Data/Swagger/ParamSchemaSpec.hs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{-# LANGUAGE QuasiQuotes #-}
module Data.Swagger.ParamSchemaSpec where

import Data.Aeson
import Data.Aeson (Value)
import Data.Aeson.QQ
import Data.Char
import Data.Proxy
Expand Down
2 changes: 1 addition & 1 deletion test/Data/Swagger/SchemaSpec.hs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import Prelude ()
import Prelude.Compat

import Control.Lens ((^.))
import Data.Aeson
import Data.Aeson (Value)
import Data.Aeson.QQ
import Data.Char
import qualified Data.HashMap.Strict.InsOrd as InsOrdHashMap
Expand Down

0 comments on commit 69ef475

Please sign in to comment.