4e28a45 · servant · git.iko.soy

git.iko.soy/servant

Merge pull request #235 from haskell-servant/jkarni/0.4-fixes

Werror fixes

commit4e28a45da42f88348c52e5b686c605d542e839ad authorJulian Arni <jkarni@gmail.com> dateWed 23 Sep 2015, 16:29 (11 years ago) parentafc0f31 c60588a

16 files changed+38−28

compare with master

unifiedsplit

scripts/test-all.sh+2−1 servant-docs/src/Servant/Docs/Internal.hs+7−5 servant-examples/auth-combinator/auth-combinator.hs+1 servant-examples/hackage/hackage.hs+2 servant-examples/servant-examples.cabal+1 servant-examples/tutorial/T1.hs+1−6 servant-examples/tutorial/T10.hs+1 servant-examples/tutorial/T3.hs+1−1 servant-examples/tutorial/T4.hs+3−2 servant-examples/tutorial/T8.hs+1−1 servant-examples/tutorial/T9.hs+1 servant-examples/wai-middleware/wai-middleware.hs+1 servant-jquery/src/Servant/JQuery/Internal.hs+12−11 servant-mock/src/Servant/Mock.hs+2−1 servant/test/Servant/API/ContentTypesSpec.hs+1 stack.yaml+1

scripts/test-all.sh+2−1

@@ -17,7 +17,8 @@ set -o errexit

1717DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )

1818. "$DIR"/lib/common.sh

1919

20−GHC_FLAGS="-Werror"

20+# TODO: Remove missing-methods after https://github.com/bos/aeson/issues/290

21+GHC_FLAGS="-Werror -fno-warn-missing-methods"

2122

2223prepare_sandbox () {

2324 $CABAL sandbox init

servant-docs/src/Servant/Docs/Internal.hs+7−5

@@ -22,18 +22,20 @@ module Servant.Docs.Internal where

2222#if !MIN_VERSION_base(4,8,0)

2323import Control.Applicative

2424#endif

25−import Control.Lens

25+import Control.Lens (makeLenses, over, traversed, (%~),

26+ (&), (.~), (<>~), (^.), _1, _2,

27+ _last, (|>))

28+import Data.ByteString.Conversion (ToByteString, toByteString)

2629import Data.ByteString.Lazy.Char8 (ByteString)

2730import qualified Data.CaseInsensitive as CI

28−import Data.Hashable

31+import Data.Hashable (Hashable)

2932import Data.HashMap.Strict (HashMap)

3033import Data.List

3134import Data.Maybe

3235import Data.Monoid

3336import Data.Ord (comparing)

34−import Data.Proxy

35−import Data.ByteString.Conversion (ToByteString, toByteString)

36−import Data.String.Conversions

37+import Data.Proxy (Proxy(Proxy))

38+import Data.String.Conversions (cs)

3739import Data.Text (Text, pack, unpack)

3840import GHC.Exts (Constraint)

3941import GHC.Generics

servant-examples/auth-combinator/auth-combinator.hs+1

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

55{-# LANGUAGE FlexibleInstances #-}

66{-# LANGUAGE OverloadedStrings #-}

77{-# LANGUAGE ScopedTypeVariables #-}

8+{-# OPTIONS_GHC -fno-warn-unused-binds #-}

89import Data.Aeson

910import Data.ByteString (ByteString)

1011import Data.Text (Text)

servant-examples/hackage/hackage.hs+2

@@ -2,6 +2,8 @@

22{-# LANGUAGE DeriveGeneric #-}

33{-# LANGUAGE TypeOperators #-}

44{-# LANGUAGE OverloadedStrings #-}

5+{-# OPTIONS_GHC -fno-warn-unused-binds #-}

6+{-# OPTIONS_GHC -fno-warn-unused-imports #-}

57import Control.Applicative

68import Control.Monad

79import Control.Monad.IO.Class

servant-examples/servant-examples.cabal+1

@@ -45,6 +45,7 @@ executable tutorial

4545

4646executable t8-main

4747 main-is: t8-main.hs

48+ other-modules: T3, T8

4849 hs-source-dirs: tutorial

4950 default-language: Haskell2010

5051 build-depends:

servant-examples/tutorial/T1.hs+1−6

@@ -17,17 +17,12 @@ data User = User

1717 , registration_date :: Day

1818 } deriving (Eq, Show, Generic)

1919

20−-- orphan ToJSON instance for Day. necessary to derive one for User

21−instance ToJSON Day where

22− -- display a day in YYYY-mm-dd format

23− toJSON d = toJSON (showGregorian d)

24−

2520instance ToJSON User

2621

2722type UserAPI = "users" :> Get '[JSON] [User]

2823

2924users :: [User]

30−users =

25+users =

3126 [ User "Isaac Newton" 372 "isaac@newton.co.uk" (fromGregorian 1683 3 1)

3227 , User "Albert Einstein" 136 "ae@mc2.org" (fromGregorian 1905 12 1)

3328 ]

servant-examples/tutorial/T10.hs+1

@@ -4,6 +4,7 @@

44{-# LANGUAGE FlexibleInstances #-}

55{-# LANGUAGE OverloadedStrings #-}

66{-# LANGUAGE MultiParamTypeClasses #-}

7+{-# OPTIONS_GHC -fno-warn-orphans #-}

78module T10 where

910import Data.ByteString.Lazy (ByteString)

servant-examples/tutorial/T3.hs+1−1

@@ -70,7 +70,7 @@ server = position

7070 :<|> marketing

7171

7272 where position :: Int -> Int -> EitherT ServantErr IO Position

73− position x y = return (Position x y)

73+ position a b = return (Position a b)

7474

7575 hello :: Maybe String -> EitherT ServantErr IO HelloMessage

7676 hello mname = return . HelloMessage $ case mname of

servant-examples/tutorial/T4.hs+3−2

@@ -4,6 +4,7 @@

44{-# LANGUAGE TypeOperators #-}

55{-# LANGUAGE FlexibleInstances #-}

66{-# LANGUAGE OverloadedStrings #-}

7+{-# OPTIONS_GHC -fno-warn-unused-imports #-}

78module T4 where

910import Data.Aeson

@@ -35,13 +36,13 @@ instance ToHtml Person where

3536

3637-- HTML serialization of a list of persons

3738instance ToHtml [Person] where

38− toHtml persons = table_ $ do

39+ toHtml ps = table_ $ do

3940 tr_ $ do

4041 th_ "first name"

4142 th_ "last name"

4243 th_ "age"

4344

44− foldMap toHtml persons

45+ foldMap toHtml ps

4546

4647 toHtmlRaw = toHtml

4748

servant-examples/tutorial/T8.hs+1−1

@@ -1,10 +1,10 @@

11{-# LANGUAGE DataKinds #-}

22{-# LANGUAGE TypeFamilies #-}

33{-# LANGUAGE TypeOperators #-}

4+{-# OPTIONS_GHC -fno-warn-name-shadowing #-}

45module T8 where

67import Control.Monad.Trans.Either

7−import Data.Aeson

88import Servant

99import Servant.Client

1010

servant-examples/tutorial/T9.hs+1

@@ -3,6 +3,7 @@

33{-# LANGUAGE DeriveGeneric #-}

44{-# LANGUAGE TypeOperators #-}

55{-# LANGUAGE OverloadedStrings #-}

6+{-# OPTIONS_GHC -fno-warn-unused-imports #-}

67module T9 where

89import Control.Applicative

servant-examples/wai-middleware/wai-middleware.hs+1

@@ -1,6 +1,7 @@

11{-# LANGUAGE DataKinds #-}

22{-# LANGUAGE DeriveGeneric #-}

33{-# LANGUAGE OverloadedStrings #-}

4+{-# OPTIONS_GHC -fno-warn-unused-binds #-}

45import Data.Aeson

56import Data.Text

67import GHC.Generics

servant-jquery/src/Servant/JQuery/Internal.hs+12−11

@@ -11,19 +11,20 @@

1111module Servant.JQuery.Internal where

1212

1313#if !MIN_VERSION_base(4,8,0)

14−import Control.Applicative

14+import Control.Applicative

1515#endif

16−import Control.Lens

17−import Data.Char (toLower)

18−import qualified Data.CharSet as Set

16+import Control.Lens (makeLenses, (%~), (&), (.~)

17+ , (<>~), (^.), _last)

18+import Data.Char (toLower)

19+import qualified Data.CharSet as Set

1920import qualified Data.CharSet.Unicode.Category as Set

20−import Data.List

21−import Data.Monoid

22−import Data.Proxy

23−import qualified Data.Text as T

24−import GHC.Exts (Constraint)

25−import GHC.TypeLits

26−import Servant.API

21+import Data.List

22+import Data.Monoid

23+import Data.Proxy

24+import qualified Data.Text as T

25+import GHC.Exts (Constraint)

26+import GHC.TypeLits

27+import Servant.API

2728

2829type Arg = String

2930

servant-mock/src/Servant/Mock.hs+2−1

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

55{-# LANGUAGE ScopedTypeVariables #-}

66{-# LANGUAGE TypeFamilies #-}

77{-# LANGUAGE TypeOperators #-}

8+{-# OPTIONS_GHC -fno-warn-orphans #-}

89-- |

910-- Module : Servant.Mock

1011-- Copyright : 2015 Alp Mestanogullari

@@ -153,7 +154,7 @@ instance (Arbitrary a, AllCTRender ctypes a) => HasMock (Put ctypes a) where

153154 mock _ = mockArbitrary

154155

155156instance HasMock Raw where

156− mock _ = \req respond -> do

157+ mock _ = \_ respond -> do

157158 bdy <- genBody

158159 respond $ responseLBS status200 [] bdy

159160

servant/test/Servant/API/ContentTypesSpec.hs+1

@@ -4,6 +4,7 @@

44{-# LANGUAGE MultiParamTypeClasses #-}

55{-# LANGUAGE OverloadedStrings #-}

66{-# OPTIONS_GHC -fno-warn-orphans #-}

78module Servant.API.ContentTypesSpec where

910#if !MIN_VERSION_base(4,8,0)

stack.yaml+1

@@ -11,4 +11,5 @@ packages:

1111extra-deps:

1212- engine-io-wai-1.0.2

1313- attoparsec-0.13.0.1

14+- aeson-0.10.0.0

1415resolver: nightly-2015-07-24