git.iko.soy/rowtype-yoga/purescript-native
on golang help sign in
Merge pull request #1420 from erdeszt/move-werror-to-travis-config
5fae353Phil Freeman
.travis.yml+1−1
@@ -56,7 +56,7 @@ install:
56 - cp -r .cabal-sandbox ~/cabal-sandboxes/$GHCVER-${STACKAGE:-none}
56 - cp -r .cabal-sandbox ~/cabal-sandboxes/$GHCVER-${STACKAGE:-none}
57script:
57script:
58 - ./travis/configure.sh
58 - ./travis/configure.sh
59− - cabal build
59+ - cabal build --ghc-options="-Werror"
60 - cabal test
60 - cabal test
61 - ./travis/test-install.sh
61 - ./travis/test-install.sh
62after_script:
62after_script:
psci/tests/Main.hs+3
@@ -1,11 +1,14 @@
1{-# LANGUAGE RecordWildCards #-}
1{-# LANGUAGE RecordWildCards #-}
2{-# LANGUAGE TupleSections #-}
2{-# LANGUAGE TupleSections #-}
3+{-# LANGUAGE CPP #-}
3
4
4module Main where
5module Main where
5
6
6import Control.Monad.Trans.State.Strict (runStateT)
7import Control.Monad.Trans.State.Strict (runStateT)
7import Control.Monad (when, forM)
8import Control.Monad (when, forM)
9+#if __GLASGOW_HASKELL__ < 710
8import Control.Applicative
10import Control.Applicative
11+#endif
9import Control.Monad.Writer.Strict (runWriterT)
12import Control.Monad.Writer.Strict (runWriterT)
10import Control.Monad.Trans.Except (runExceptT)
13import Control.Monad.Trans.Except (runExceptT)
11
14
src/Language/PureScript/Sugar/Names/Exports.hs+1−1
@@ -26,7 +26,7 @@ import Data.List (find, intersect)
26import Data.Maybe (fromMaybe, mapMaybe)
26import Data.Maybe (fromMaybe, mapMaybe)
27
27
28#if __GLASGOW_HASKELL__ < 710
28#if __GLASGOW_HASKELL__ < 710
29−import Control.Applicative (Applicative(..), (<$>), (<*>))
29+import Control.Applicative (Applicative(..), (<$>))
30#endif
30#endif
31import Control.Monad
31import Control.Monad
32import Control.Monad.Error.Class (MonadError(..))
32import Control.Monad.Error.Class (MonadError(..))
src/Language/PureScript/Sugar/Names/Imports.hs+1−1
@@ -23,7 +23,7 @@ import Data.Maybe (fromMaybe, isNothing)
23
23
24import Control.Arrow (first)
24import Control.Arrow (first)
25#if __GLASGOW_HASKELL__ < 710
25#if __GLASGOW_HASKELL__ < 710
26−import Control.Applicative (Applicative(..), (<$>), (<*>))
26+import Control.Applicative (Applicative(..), (<$>))
27#endif
27#endif
28import Control.Monad
28import Control.Monad
29import Control.Monad.Error.Class (MonadError(..))
29import Control.Monad.Error.Class (MonadError(..))
tests/Main.hs+5
@@ -16,6 +16,7 @@
16{-# LANGUAGE TupleSections #-}
16{-# LANGUAGE TupleSections #-}
17{-# LANGUAGE GeneralizedNewtypeDeriving #-}
17{-# LANGUAGE GeneralizedNewtypeDeriving #-}
18{-# LANGUAGE FlexibleInstances #-}
18{-# LANGUAGE FlexibleInstances #-}
19+{-# LANGUAGE CPP #-}
19
20
20-- Failing tests can specify the kind of error that should be thrown with a
21-- Failing tests can specify the kind of error that should be thrown with a
21-- @shouldFailWith declaration. For example:
22-- @shouldFailWith declaration. For example:
@@ -41,14 +42,18 @@ import qualified Language.PureScript.CoreFn as CF
41import Data.Char (isSpace)
42import Data.Char (isSpace)
42import Data.Maybe (mapMaybe, fromMaybe)
43import Data.Maybe (mapMaybe, fromMaybe)
43import Data.List (isSuffixOf, sort, stripPrefix)
44import Data.List (isSuffixOf, sort, stripPrefix)
45+#if __GLASGOW_HASKELL__ < 710
44import Data.Traversable (traverse)
46import Data.Traversable (traverse)
47+#endif
45import Data.Time.Clock (UTCTime())
48import Data.Time.Clock (UTCTime())
46
49
47import qualified Data.Map as M
50import qualified Data.Map as M
48
51
49import Control.Monad
52import Control.Monad
50import Control.Monad.IO.Class (liftIO)
53import Control.Monad.IO.Class (liftIO)
54+#if __GLASGOW_HASKELL__ < 710
51import Control.Applicative
55import Control.Applicative
56+#endif
52import Control.Arrow ((>>>))
57import Control.Arrow ((>>>))
53
58
54import Control.Monad.Reader
59import Control.Monad.Reader
tests/common/TestsSetup.hs+1
@@ -21,6 +21,7 @@ import Data.Maybe (fromMaybe)
21import Control.Applicative
21import Control.Applicative
22#endif
22#endif
23import Control.Monad
23import Control.Monad
24+
24import Control.Monad.Trans.Maybe
25import Control.Monad.Trans.Maybe
25
26
26import System.Process
27import System.Process