From 74855db87b773ffc9f18f210f39166940751cbbb Mon Sep 17 00:00:00 2001 From: "Adam C. Baker" Date: Wed, 5 Nov 2014 00:32:10 -0800 Subject: [PATCH] declare required extensions and remove default extension pragmas (OverloadedStrings) --- dbapi.cabal | 3 +++ src/Dbapi.hs | 2 -- src/Main.hs | 2 -- src/Middleware.hs | 1 - src/PgQuery.hs | 3 --- src/PgStructure.hs | 2 -- src/RangeQuery.hs | 2 -- src/Types.hs | 1 - test/Feature/AuthSpec.hs | 2 +- test/Feature/CorsSpec.hs | 2 -- test/Feature/InsertSpec.hs | 3 +-- test/Feature/QuerySpec.hs | 2 -- test/Feature/RangeSpec.hs | 1 - test/Feature/StructureSpec.hs | 2 +- test/SpecHelper.hs | 1 - test/TestTypes.hs | 1 - test/Unit/ErrorsSpec.hs | 1 - test/Unit/PgQuerySpec.hs | 2 -- test/Unit/PgStructureSpec.hs | 2 -- 19 files changed, 6 insertions(+), 29 deletions(-) diff --git a/dbapi.cabal b/dbapi.cabal index ada50dc54..ad548cec8 100644 --- a/dbapi.cabal +++ b/dbapi.cabal @@ -13,6 +13,7 @@ executable dbapi main-is: Main.hs ghc-options: -Wall -W -Werror -O2 default-language: Haskell2010 + default-extensions: OverloadedStrings build-depends: base >=4.6 && <5 , HDBC, HDBC-postgresql , warp, wai >= 3.0.1 && < 3.0.2 @@ -42,6 +43,8 @@ executable dbapi Test-Suite spec Type: exitcode-stdio-1.0 Default-Language: Haskell2010 + default-extensions: OverloadedStrings + other-extensions: QuasiQuotes Hs-Source-Dirs: test, src ghc-options: -Wall -W -Werror Main-Is: Main.hs diff --git a/src/Dbapi.hs b/src/Dbapi.hs index 594d5aec3..0d09dbcab 100644 --- a/src/Dbapi.hs +++ b/src/Dbapi.hs @@ -1,5 +1,3 @@ -{-# LANGUAGE OverloadedStrings #-} - -- {{{ Imports module Dbapi where diff --git a/src/Main.hs b/src/Main.hs index 09adc7927..c992a2054 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -1,5 +1,3 @@ -{-# LANGUAGE OverloadedStrings #-} - module Main where import Paths_dbapi (version) diff --git a/src/Middleware.hs b/src/Middleware.hs index 092cc3e09..18e308293 100644 --- a/src/Middleware.hs +++ b/src/Middleware.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE OverloadedStrings #-} {-# OPTIONS_GHC -fno-warn-orphans #-} module Middleware where diff --git a/src/PgQuery.hs b/src/PgQuery.hs index 4df2a7823..8fb7e3ed0 100644 --- a/src/PgQuery.hs +++ b/src/PgQuery.hs @@ -1,7 +1,4 @@ -{-# LANGUAGE OverloadedStrings #-} - -- {{{ Imports - module PgQuery ( getRows , insert diff --git a/src/PgStructure.hs b/src/PgStructure.hs index d9f27177c..e323a1569 100644 --- a/src/PgStructure.hs +++ b/src/PgStructure.hs @@ -1,5 +1,3 @@ -{-# LANGUAGE OverloadedStrings #-} - module PgStructure where import Data.Functor ( (<$>) ) diff --git a/src/RangeQuery.hs b/src/RangeQuery.hs index 9daabe995..45b6dfdbc 100644 --- a/src/RangeQuery.hs +++ b/src/RangeQuery.hs @@ -1,5 +1,3 @@ -{-# LANGUAGE OverloadedStrings #-} - module RangeQuery where import Control.Applicative diff --git a/src/Types.hs b/src/Types.hs index 9140a8d2d..0ad9a72ab 100644 --- a/src/Types.hs +++ b/src/Types.hs @@ -1,5 +1,4 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} - module Types where import Database.HDBC (toSql, iToSql, SqlValue(..)) diff --git a/test/Feature/AuthSpec.hs b/test/Feature/AuthSpec.hs index 314d298f9..55e754d9c 100644 --- a/test/Feature/AuthSpec.hs +++ b/test/Feature/AuthSpec.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE OverloadedStrings, QuasiQuotes #-} +{-# LANGUAGE QuasiQuotes #-} module Feature.AuthSpec where -- {{{ Imports diff --git a/test/Feature/CorsSpec.hs b/test/Feature/CorsSpec.hs index 29e9bed44..4d25b04aa 100644 --- a/test/Feature/CorsSpec.hs +++ b/test/Feature/CorsSpec.hs @@ -1,5 +1,3 @@ -{-# LANGUAGE OverloadedStrings #-} - module Feature.CorsSpec where -- {{{ Imports diff --git a/test/Feature/InsertSpec.hs b/test/Feature/InsertSpec.hs index 6678fba7f..4fa68bbf8 100644 --- a/test/Feature/InsertSpec.hs +++ b/test/Feature/InsertSpec.hs @@ -1,5 +1,4 @@ - -{-# LANGUAGE OverloadedStrings, QuasiQuotes #-} +{-# LANGUAGE QuasiQuotes #-} module Feature.InsertSpec where -- {{{ Imports diff --git a/test/Feature/QuerySpec.hs b/test/Feature/QuerySpec.hs index fcfad55ce..06328b685 100644 --- a/test/Feature/QuerySpec.hs +++ b/test/Feature/QuerySpec.hs @@ -1,5 +1,3 @@ - -{-# LANGUAGE OverloadedStrings #-} module Feature.QuerySpec where import Test.Hspec diff --git a/test/Feature/RangeSpec.hs b/test/Feature/RangeSpec.hs index 7135f162a..8beba88bb 100644 --- a/test/Feature/RangeSpec.hs +++ b/test/Feature/RangeSpec.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE OverloadedStrings #-} module Feature.RangeSpec where import Test.Hspec diff --git a/test/Feature/StructureSpec.hs b/test/Feature/StructureSpec.hs index 42cffb610..7ef6471f3 100644 --- a/test/Feature/StructureSpec.hs +++ b/test/Feature/StructureSpec.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE OverloadedStrings, QuasiQuotes #-} +{-# LANGUAGE QuasiQuotes #-} module Feature.StructureSpec where import Test.Hspec diff --git a/test/SpecHelper.hs b/test/SpecHelper.hs index 6e9f7940a..1428e3a5b 100644 --- a/test/SpecHelper.hs +++ b/test/SpecHelper.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE OverloadedStrings #-} module SpecHelper where import Network.Wai diff --git a/test/TestTypes.hs b/test/TestTypes.hs index d5ece1e1f..6e997ab5b 100644 --- a/test/TestTypes.hs +++ b/test/TestTypes.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE OverloadedStrings #-} module TestTypes ( IncPK(..), fromList diff --git a/test/Unit/ErrorsSpec.hs b/test/Unit/ErrorsSpec.hs index 8d052d667..c5d871b5a 100644 --- a/test/Unit/ErrorsSpec.hs +++ b/test/Unit/ErrorsSpec.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE OverloadedStrings #-} module Unit.ErrorsSpec where import Test.Hspec diff --git a/test/Unit/PgQuerySpec.hs b/test/Unit/PgQuerySpec.hs index 6fb57bbc8..948e8e17c 100644 --- a/test/Unit/PgQuerySpec.hs +++ b/test/Unit/PgQuerySpec.hs @@ -1,5 +1,3 @@ -{-# LANGUAGE OverloadedStrings #-} - module Unit.PgQuerySpec where import Test.Hspec diff --git a/test/Unit/PgStructureSpec.hs b/test/Unit/PgStructureSpec.hs index 5b2a8c3ae..3ba1954bf 100644 --- a/test/Unit/PgStructureSpec.hs +++ b/test/Unit/PgStructureSpec.hs @@ -1,5 +1,3 @@ -{-# LANGUAGE OverloadedStrings #-} - module Unit.PgStructureSpec where import Test.Hspec