From 48c2cc638a396b5c8e3696fd08d0fedb3b0aefc3 Mon Sep 17 00:00:00 2001 From: "Julian K. Arni" Date: Wed, 23 Sep 2015 14:58:47 +0200 Subject: [PATCH] Loads of Werror fixes --- servant-docs/example/greet.hs | 1 + servant-docs/test/Servant/DocsSpec.hs | 1 + servant-examples/auth-combinator/auth-combinator.hs | 2 ++ servant-examples/hackage/hackage.hs | 2 ++ servant-examples/servant-examples.cabal | 1 + servant-examples/tutorial/T1.hs | 1 + servant-examples/tutorial/T10.hs | 1 + servant-examples/tutorial/T2.hs | 1 + servant-examples/tutorial/T3.hs | 3 ++- servant-examples/tutorial/T4.hs | 6 ++++-- servant-examples/tutorial/T5.hs | 1 + servant-examples/tutorial/T8.hs | 3 ++- servant-examples/tutorial/T9.hs | 2 ++ servant-examples/wai-middleware/wai-middleware.hs | 2 ++ servant-mock/src/Servant/Mock.hs | 3 ++- servant-server/example/greet.hs | 1 + 16 files changed, 26 insertions(+), 5 deletions(-) diff --git a/servant-docs/example/greet.hs b/servant-docs/example/greet.hs index 1835b290..c60a86e5 100644 --- a/servant-docs/example/greet.hs +++ b/servant-docs/example/greet.hs @@ -5,6 +5,7 @@ {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE TypeOperators #-} {-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -fno-warn-missing-methods #-} import Control.Lens import Data.Aeson import Data.Proxy diff --git a/servant-docs/test/Servant/DocsSpec.hs b/servant-docs/test/Servant/DocsSpec.hs index 9da66448..ef2bbeb9 100644 --- a/servant-docs/test/Servant/DocsSpec.hs +++ b/servant-docs/test/Servant/DocsSpec.hs @@ -5,6 +5,7 @@ {-# LANGUAGE TypeOperators #-} {-# LANGUAGE TypeSynonymInstances #-} {-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -fno-warn-missing-methods #-} module Servant.DocsSpec where import Control.Lens diff --git a/servant-examples/auth-combinator/auth-combinator.hs b/servant-examples/auth-combinator/auth-combinator.hs index c6373fe1..0f9b4840 100644 --- a/servant-examples/auth-combinator/auth-combinator.hs +++ b/servant-examples/auth-combinator/auth-combinator.hs @@ -5,6 +5,8 @@ {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE ScopedTypeVariables #-} +{-# OPTIONS_GHC -fno-warn-missing-methods #-} +{-# OPTIONS_GHC -fno-warn-unused-binds #-} import Data.Aeson import Data.ByteString (ByteString) import Data.Text (Text) diff --git a/servant-examples/hackage/hackage.hs b/servant-examples/hackage/hackage.hs index e205fc12..cd17fb4d 100644 --- a/servant-examples/hackage/hackage.hs +++ b/servant-examples/hackage/hackage.hs @@ -2,6 +2,8 @@ {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE TypeOperators #-} {-# LANGUAGE OverloadedStrings #-} +{-# OPTIONS_GHC -fno-warn-unused-binds #-} +{-# OPTIONS_GHC -fno-warn-unused-imports #-} import Control.Applicative import Control.Monad import Control.Monad.IO.Class diff --git a/servant-examples/servant-examples.cabal b/servant-examples/servant-examples.cabal index 83dbde70..d26f6de4 100644 --- a/servant-examples/servant-examples.cabal +++ b/servant-examples/servant-examples.cabal @@ -45,6 +45,7 @@ executable tutorial executable t8-main main-is: t8-main.hs + other-modules: T3, T8 hs-source-dirs: tutorial default-language: Haskell2010 build-depends: diff --git a/servant-examples/tutorial/T1.hs b/servant-examples/tutorial/T1.hs index d7cd396f..ee386725 100644 --- a/servant-examples/tutorial/T1.hs +++ b/servant-examples/tutorial/T1.hs @@ -2,6 +2,7 @@ {-# LANGUAGE TypeFamilies #-} {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE TypeOperators #-} +{-# OPTIONS_GHC -fno-warn-missing-methods #-} module T1 where import Data.Aeson diff --git a/servant-examples/tutorial/T10.hs b/servant-examples/tutorial/T10.hs index 39e48e04..3b010d34 100644 --- a/servant-examples/tutorial/T10.hs +++ b/servant-examples/tutorial/T10.hs @@ -4,6 +4,7 @@ {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE MultiParamTypeClasses #-} +{-# OPTIONS_GHC -fno-warn-orphans #-} module T10 where import Data.ByteString.Lazy (ByteString) diff --git a/servant-examples/tutorial/T2.hs b/servant-examples/tutorial/T2.hs index c68772c8..39659462 100644 --- a/servant-examples/tutorial/T2.hs +++ b/servant-examples/tutorial/T2.hs @@ -2,6 +2,7 @@ {-# LANGUAGE TypeFamilies #-} {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE TypeOperators #-} +{-# OPTIONS_GHC -fno-warn-missing-methods #-} module T2 where import Data.Aeson diff --git a/servant-examples/tutorial/T3.hs b/servant-examples/tutorial/T3.hs index dcff930b..b3cf0809 100644 --- a/servant-examples/tutorial/T3.hs +++ b/servant-examples/tutorial/T3.hs @@ -2,6 +2,7 @@ {-# LANGUAGE TypeFamilies #-} {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE TypeOperators #-} +{-# OPTIONS_GHC -fno-warn-missing-methods #-} module T3 where import Control.Monad.Trans.Either @@ -70,7 +71,7 @@ server = position :<|> marketing where position :: Int -> Int -> EitherT ServantErr IO Position - position x y = return (Position x y) + position a b = return (Position a b) hello :: Maybe String -> EitherT ServantErr IO HelloMessage hello mname = return . HelloMessage $ case mname of diff --git a/servant-examples/tutorial/T4.hs b/servant-examples/tutorial/T4.hs index 94f8df73..8ae6161e 100644 --- a/servant-examples/tutorial/T4.hs +++ b/servant-examples/tutorial/T4.hs @@ -4,6 +4,8 @@ {-# LANGUAGE TypeOperators #-} {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE OverloadedStrings #-} +{-# OPTIONS_GHC -fno-warn-unused-imports #-} +{-# OPTIONS_GHC -fno-warn-missing-methods #-} module T4 where import Data.Aeson @@ -35,13 +37,13 @@ instance ToHtml Person where -- HTML serialization of a list of persons instance ToHtml [Person] where - toHtml persons = table_ $ do + toHtml ps = table_ $ do tr_ $ do th_ "first name" th_ "last name" th_ "age" - foldMap toHtml persons + foldMap toHtml ps toHtmlRaw = toHtml diff --git a/servant-examples/tutorial/T5.hs b/servant-examples/tutorial/T5.hs index 0811fd9b..de238a76 100644 --- a/servant-examples/tutorial/T5.hs +++ b/servant-examples/tutorial/T5.hs @@ -3,6 +3,7 @@ {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE TypeOperators #-} {-# LANGUAGE OverloadedStrings #-} +{-# OPTIONS_GHC -fno-warn-missing-methods #-} module T5 where import Control.Monad.IO.Class diff --git a/servant-examples/tutorial/T8.hs b/servant-examples/tutorial/T8.hs index 089702bc..91af6f63 100644 --- a/servant-examples/tutorial/T8.hs +++ b/servant-examples/tutorial/T8.hs @@ -1,10 +1,11 @@ {-# LANGUAGE DataKinds #-} {-# LANGUAGE TypeFamilies #-} {-# LANGUAGE TypeOperators #-} +{-# OPTIONS_GHC -fno-warn-name-shadowing #-} +{-# OPTIONS_GHC -fno-warn-missing-methods #-} module T8 where import Control.Monad.Trans.Either -import Data.Aeson import Servant import Servant.Client diff --git a/servant-examples/tutorial/T9.hs b/servant-examples/tutorial/T9.hs index 1b0633f0..1f120c09 100644 --- a/servant-examples/tutorial/T9.hs +++ b/servant-examples/tutorial/T9.hs @@ -3,6 +3,8 @@ {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE TypeOperators #-} {-# LANGUAGE OverloadedStrings #-} +{-# OPTIONS_GHC -fno-warn-unused-imports #-} +{-# OPTIONS_GHC -fno-warn-missing-methods #-} module T9 where import Control.Applicative diff --git a/servant-examples/wai-middleware/wai-middleware.hs b/servant-examples/wai-middleware/wai-middleware.hs index ef772665..737045c2 100644 --- a/servant-examples/wai-middleware/wai-middleware.hs +++ b/servant-examples/wai-middleware/wai-middleware.hs @@ -1,6 +1,8 @@ {-# LANGUAGE DataKinds #-} {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE OverloadedStrings #-} +{-# OPTIONS_GHC -fno-warn-unused-binds #-} +{-# OPTIONS_GHC -fno-warn-missing-methods #-} import Data.Aeson import Data.Text import GHC.Generics diff --git a/servant-mock/src/Servant/Mock.hs b/servant-mock/src/Servant/Mock.hs index eabc1642..a53e6ec4 100644 --- a/servant-mock/src/Servant/Mock.hs +++ b/servant-mock/src/Servant/Mock.hs @@ -5,6 +5,7 @@ {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE TypeFamilies #-} {-# LANGUAGE TypeOperators #-} +{-# OPTIONS_GHC -fno-warn-orphans #-} -- | -- Module : Servant.Mock -- Copyright : 2015 Alp Mestanogullari @@ -153,7 +154,7 @@ instance (Arbitrary a, AllCTRender ctypes a) => HasMock (Put ctypes a) where mock _ = mockArbitrary instance HasMock Raw where - mock _ = \req respond -> do + mock _ = \_ respond -> do bdy <- genBody respond $ responseLBS status200 [] bdy diff --git a/servant-server/example/greet.hs b/servant-server/example/greet.hs index cd8bd138..0e5fdb98 100644 --- a/servant-server/example/greet.hs +++ b/servant-server/example/greet.hs @@ -4,6 +4,7 @@ {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE TypeOperators #-} {-# LANGUAGE OverloadedStrings #-} +{-# OPTIONS_GHC -fno-warn-missing-methods #-} import Data.Aeson import Data.Monoid