From 008f2434ee652f904a9fbb260ec16b875538c141 Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Fri, 22 Apr 2016 09:32:39 +0300 Subject: [PATCH] Add -Wno-redundant-constraints --- servant-client/servant-client.cabal | 2 ++ servant-client/test/Servant/ClientSpec.hs | 4 ++++ servant-docs/servant-docs.cabal | 2 ++ servant-foreign/servant-foreign.cabal | 2 ++ servant-server/servant-server.cabal | 2 ++ servant/servant.cabal | 2 ++ 6 files changed, 14 insertions(+) diff --git a/servant-client/servant-client.cabal b/servant-client/servant-client.cabal index 64164cf7..55886ef2 100644 --- a/servant-client/servant-client.cabal +++ b/servant-client/servant-client.cabal @@ -56,6 +56,8 @@ library hs-source-dirs: src default-language: Haskell2010 ghc-options: -Wall + if impl(ghc >= 8.0) + ghc-options: -Wno-redundant-constraints include-dirs: include test-suite spec diff --git a/servant-client/test/Servant/ClientSpec.hs b/servant-client/test/Servant/ClientSpec.hs index c41b4093..4a6ed243 100644 --- a/servant-client/test/Servant/ClientSpec.hs +++ b/servant-client/test/Servant/ClientSpec.hs @@ -15,7 +15,11 @@ {-# LANGUAGE TypeFamilies #-} {-# LANGUAGE TypeOperators #-} {-# LANGUAGE UndecidableInstances #-} +#if __GLASGOW_HASKELL__ >= 800 +{-# OPTIONS_GHC -freduction-depth=100 #-} +#else {-# OPTIONS_GHC -fcontext-stack=100 #-} +#endif {-# OPTIONS_GHC -fno-warn-orphans #-} {-# OPTIONS_GHC -fno-warn-name-shadowing #-} diff --git a/servant-docs/servant-docs.cabal b/servant-docs/servant-docs.cabal index dc7f19b3..4352d259 100644 --- a/servant-docs/servant-docs.cabal +++ b/servant-docs/servant-docs.cabal @@ -50,6 +50,8 @@ library hs-source-dirs: src default-language: Haskell2010 ghc-options: -Wall + if impl(ghc >= 8.0) + ghc-options: -Wno-redundant-constraints include-dirs: include executable greet-docs diff --git a/servant-foreign/servant-foreign.cabal b/servant-foreign/servant-foreign.cabal index 3e246e53..a5f91a39 100644 --- a/servant-foreign/servant-foreign.cabal +++ b/servant-foreign/servant-foreign.cabal @@ -37,6 +37,8 @@ library hs-source-dirs: src default-language: Haskell2010 ghc-options: -Wall + if impl(ghc >= 8.0) + ghc-options: -Wno-redundant-constraints include-dirs: include default-extensions: CPP , ConstraintKinds diff --git a/servant-server/servant-server.cabal b/servant-server/servant-server.cabal index b0ae526a..3a91a8ad 100644 --- a/servant-server/servant-server.cabal +++ b/servant-server/servant-server.cabal @@ -74,6 +74,8 @@ library hs-source-dirs: src default-language: Haskell2010 ghc-options: -Wall + if impl(ghc >= 8.0) + ghc-options: -Wno-redundant-constraints include-dirs: include executable greet diff --git a/servant/servant.cabal b/servant/servant.cabal index 4f0e5579..cfaa7384 100644 --- a/servant/servant.cabal +++ b/servant/servant.cabal @@ -88,6 +88,8 @@ library , TypeSynonymInstances , UndecidableInstances ghc-options: -Wall + if impl(ghc >= 8.0) + ghc-options: -Wno-redundant-constraints include-dirs: include test-suite spec