From e38892a084f0056db9405c68fc94dcefa3385da4 Mon Sep 17 00:00:00 2001 From: Michael Sloan Date: Wed, 17 Jan 2018 02:52:47 -0800 Subject: [PATCH] Remove usage of default exts, now "stack ghci" loads all together --- servant-foreign/servant-foreign.cabal | 28 ------------------- .../src/Servant/Foreign/Inflections.hs | 1 + .../src/Servant/Foreign/Internal.hs | 13 +++++++++ servant-foreign/test/Servant/ForeignSpec.hs | 13 ++++++++- 4 files changed, 26 insertions(+), 29 deletions(-) diff --git a/servant-foreign/servant-foreign.cabal b/servant-foreign/servant-foreign.cabal index 3e5f6e85..64eb98ef 100644 --- a/servant-foreign/servant-foreign.cabal +++ b/servant-foreign/servant-foreign.cabal @@ -47,22 +47,6 @@ library if impl(ghc >= 8.0) ghc-options: -Wno-redundant-constraints include-dirs: include - default-extensions: ConstraintKinds - , CPP - , DataKinds - , DeriveDataTypeable - , FlexibleContexts - , FlexibleInstances - , GeneralizedNewtypeDeriving - , MultiParamTypeClasses - , OverloadedStrings - , PolyKinds - , ScopedTypeVariables - , TemplateHaskell - , TypeFamilies - , TypeOperators - , UndecidableInstances - test-suite spec type: exitcode-stdio-1.0 @@ -78,15 +62,3 @@ test-suite spec , servant , servant-foreign default-language: Haskell2010 - default-extensions: ConstraintKinds - , DataKinds - , FlexibleContexts - , FlexibleInstances - , GeneralizedNewtypeDeriving - , MultiParamTypeClasses - , ScopedTypeVariables - , TypeFamilies - , TypeOperators - , UndecidableInstances - , OverloadedStrings - , PolyKinds diff --git a/servant-foreign/src/Servant/Foreign/Inflections.hs b/servant-foreign/src/Servant/Foreign/Inflections.hs index 4c0140a8..00f3f858 100644 --- a/servant-foreign/src/Servant/Foreign/Inflections.hs +++ b/servant-foreign/src/Servant/Foreign/Inflections.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE OverloadedStrings #-} module Servant.Foreign.Inflections ( concatCase , snakeCase diff --git a/servant-foreign/src/Servant/Foreign/Internal.hs b/servant-foreign/src/Servant/Foreign/Internal.hs index 38357560..a06ec46c 100644 --- a/servant-foreign/src/Servant/Foreign/Internal.hs +++ b/servant-foreign/src/Servant/Foreign/Internal.hs @@ -1,4 +1,17 @@ {-# LANGUAGE CPP #-} +{-# LANGUAGE ConstraintKinds #-} +{-# LANGUAGE DeriveDataTypeable #-} +{-# LANGUAGE FlexibleContexts #-} +{-# LANGUAGE FlexibleInstances #-} +{-# LANGUAGE GeneralizedNewtypeDeriving #-} +{-# LANGUAGE MultiParamTypeClasses #-} +{-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE ScopedTypeVariables #-} +{-# LANGUAGE TemplateHaskell #-} +{-# LANGUAGE TypeFamilies #-} +{-# LANGUAGE TypeOperators #-} +{-# LANGUAGE UndecidableInstances #-} #if !MIN_VERSION_base(4,8,0) {-# LANGUAGE NullaryTypeClasses #-} #endif diff --git a/servant-foreign/test/Servant/ForeignSpec.hs b/servant-foreign/test/Servant/ForeignSpec.hs index 2d093563..18e4985c 100644 --- a/servant-foreign/test/Servant/ForeignSpec.hs +++ b/servant-foreign/test/Servant/ForeignSpec.hs @@ -1,4 +1,15 @@ -{-# LANGUAGE CPP #-} +{-# LANGUAGE CPP #-} +{-# LANGUAGE ConstraintKinds #-} +{-# LANGUAGE DataKinds #-} +{-# LANGUAGE FlexibleContexts #-} +{-# LANGUAGE FlexibleInstances #-} +{-# LANGUAGE MultiParamTypeClasses #-} +{-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE ScopedTypeVariables #-} +{-# LANGUAGE TemplateHaskell #-} +{-# LANGUAGE TypeFamilies #-} +{-# LANGUAGE TypeOperators #-} #include "overlapping-compat.h" module Servant.ForeignSpec where