48c2cc6 · typeable/servant

git.iko.soy/typeable/servant

Loads of Werror fixes

commit48c2cc638a396b5c8e3696fd08d0fedb3b0aefc3 authorJulian K. Arni <jkarni@gmail.com> dateWed 23 Sep 2015, 14:58 (11 years ago) parentfe8408e

16 files changed+26−5

compare with master

unifiedsplit

servant-docs/example/greet.hs+1

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

55{-# LANGUAGE OverloadedStrings #-}

66{-# LANGUAGE TypeOperators #-}

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

8+{-# OPTIONS_GHC -fno-warn-missing-methods #-}

89import Control.Lens

910import Data.Aeson

1011import Data.Proxy

servant-docs/test/Servant/DocsSpec.hs+1

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

55{-# LANGUAGE TypeOperators #-}

66{-# LANGUAGE TypeSynonymInstances #-}

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

8+{-# OPTIONS_GHC -fno-warn-missing-methods #-}

89module Servant.DocsSpec where

910

1011import Control.Lens

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

@@ -5,6 +5,8 @@

55{-# LANGUAGE FlexibleInstances #-}

66{-# LANGUAGE OverloadedStrings #-}

77{-# LANGUAGE ScopedTypeVariables #-}

8+{-# OPTIONS_GHC -fno-warn-missing-methods #-}

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

810import Data.Aeson

911import Data.ByteString (ByteString)

1012import 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

@@ -2,6 +2,7 @@

22{-# LANGUAGE TypeFamilies #-}

33{-# LANGUAGE DeriveGeneric #-}

44{-# LANGUAGE TypeOperators #-}

5+{-# OPTIONS_GHC -fno-warn-missing-methods #-}

56module T1 where

78import Data.Aeson

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/T2.hs+1

@@ -2,6 +2,7 @@

22{-# LANGUAGE TypeFamilies #-}

33{-# LANGUAGE DeriveGeneric #-}

44{-# LANGUAGE TypeOperators #-}

5+{-# OPTIONS_GHC -fno-warn-missing-methods #-}

56module T2 where

78import Data.Aeson

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

@@ -2,6 +2,7 @@

22{-# LANGUAGE TypeFamilies #-}

33{-# LANGUAGE DeriveGeneric #-}

44{-# LANGUAGE TypeOperators #-}

5+{-# OPTIONS_GHC -fno-warn-missing-methods #-}

56module T3 where

78import Control.Monad.Trans.Either

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

7071 :<|> marketing

7172

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

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

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

7475

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

7677 hello mname = return . HelloMessage $ case mname of

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

@@ -4,6 +4,8 @@

44{-# LANGUAGE TypeOperators #-}

55{-# LANGUAGE FlexibleInstances #-}

66{-# LANGUAGE OverloadedStrings #-}

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

8+{-# OPTIONS_GHC -fno-warn-missing-methods #-}

79module T4 where

810

911import Data.Aeson

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

3537

3638-- HTML serialization of a list of persons

3739instance ToHtml [Person] where

38− toHtml persons = table_ $ do

40+ toHtml ps = table_ $ do

3941 tr_ $ do

4042 th_ "first name"

4143 th_ "last name"

4244 th_ "age"

4345

44− foldMap toHtml persons

46+ foldMap toHtml ps

4547

4648 toHtmlRaw = toHtml

4749

servant-examples/tutorial/T5.hs+1

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

33{-# LANGUAGE DeriveGeneric #-}

44{-# LANGUAGE TypeOperators #-}

55{-# LANGUAGE OverloadedStrings #-}

6+{-# OPTIONS_GHC -fno-warn-missing-methods #-}

67module T5 where

89import Control.Monad.IO.Class

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

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

11{-# LANGUAGE DataKinds #-}

22{-# LANGUAGE TypeFamilies #-}

33{-# LANGUAGE TypeOperators #-}

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

5+{-# OPTIONS_GHC -fno-warn-missing-methods #-}

46module T8 where

68import Control.Monad.Trans.Either

7−import Data.Aeson

89import Servant

910import Servant.Client

1011

servant-examples/tutorial/T9.hs+2

@@ -3,6 +3,8 @@

33{-# LANGUAGE DeriveGeneric #-}

44{-# LANGUAGE TypeOperators #-}

55{-# LANGUAGE OverloadedStrings #-}

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

7+{-# OPTIONS_GHC -fno-warn-missing-methods #-}

68module T9 where

810import Control.Applicative

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

@@ -1,6 +1,8 @@

11{-# LANGUAGE DataKinds #-}

22{-# LANGUAGE DeriveGeneric #-}

33{-# LANGUAGE OverloadedStrings #-}

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

5+{-# OPTIONS_GHC -fno-warn-missing-methods #-}

46import Data.Aeson

57import Data.Text

68import GHC.Generics

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-server/example/greet.hs+1

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

44{-# LANGUAGE DeriveGeneric #-}

55{-# LANGUAGE TypeOperators #-}

66{-# LANGUAGE OverloadedStrings #-}

7+{-# OPTIONS_GHC -fno-warn-missing-methods #-}

89import Data.Aeson

910import Data.Monoid