e7e30d1 · rowtype-yoga/purescript-native

git.iko.soy/rowtype-yoga/purescript-native

Merge master

commite7e30d1441c3c3328faa1cc86e11b77bcf0076ee authorPhil Freeman <paf31@cantab.net> dateSun 23 Aug 2015, 09:05 (11 years ago) parent21a065c 825e109

11 files changed+11−10

compare with golang

unifiedsplit

.travis.yml+1−1 CONTRIBUTORS.md+1 psc/Main.hs+1−1 psci/PSCi.hs+1−1 psci/tests/Main.hs+1−1 src/Language/PureScript/Docs/ParseAndDesugar.hs+1−1 src/Language/PureScript/Make.hs+1−1 src/Language/PureScript/Publish.hs+1−1 src/Language/PureScript/TypeChecker/Monad.hs+1−1 stack-lts-3.yaml+1−1 tests/Main.hs+1−1

.travis.yml+1−1

@@ -6,7 +6,7 @@ env:

66 - GHCVER=7.10.1

77 - GHCVER=7.8.4 STACKAGE=lts-2.22

88 # 7.10.2 Pending https://github.com/travis-ci/apt-package-whitelist/pull/686

9− - GHCVER=7.10.1 STACKAGE=lts-3.0

9+ - GHCVER=7.10.1 STACKAGE=lts-3.1

1010 - GHCVER=7.10.1 STACKAGE=nightly-2015-08-12

1111before_install:

1212 - export PATH="/opt/ghc/$GHCVER/bin:$PATH"

CONTRIBUTORS.md+1

@@ -50,3 +50,4 @@ This file is append-only, so that later additions can clarify or modify earlier

5050- [@vkorablin](https://github.com/vkorablin) (Vladimir Korablin) - My existing contributions and all future contributions until further notice are Copyright Vladimir Korablin, and are licensed to the owners and users of the PureScript compiler project under the terms of the MIT license.

5151- [@mrhania](https://github.com/mrhania) (Łukasz Hanuszczak) - My existing contributions and all future contributions until further notice are Copyright Łukasz Hanuszczak, and are licensed to the owners and users of the PureScript compiler project under the terms of the [MIT license](http://opensource.org/licenses/MIT).

5252- [@utkarshkukreti](https://github.com/utkarshkukreti) (Utkarsh Kukreti) My existing contributions and all future contributions until further notice are Copyright Utkarsh Kukreti, and are licensed to the owners and users of the PureScript compiler project under the terms of the [MIT license](http://opensource.org/licenses/MIT).

53+- [@L8D](https://github.com/L8D) (Tenor Biel) My existing contributions and all future contributions until further notice are Copyright Tenor Biel, and are licensed to the owners and users of the PureScript compiler project under the terms of the [MIT license](http://opensource.org/licenses/MIT).

psc/Main.hs+1−1

@@ -22,7 +22,7 @@ module Main where

2222import Control.Applicative

2323import Control.Monad

2424import Control.Monad.Error.Class (MonadError(..))

25−import Control.Monad.Writer

25+import Control.Monad.Writer.Strict

2626

2727import Data.Version (showVersion)

2828import qualified Data.Map as M

psci/PSCi.hs+1−1

@@ -36,7 +36,7 @@ import Control.Monad.Trans.Except (runExceptT)

3636import Control.Monad.Trans.Maybe (MaybeT(..), runMaybeT)

3737import Control.Monad.Trans.State.Strict

3838import Control.Monad.IO.Class (liftIO)

39−import Control.Monad.Writer (runWriter)

39+import Control.Monad.Writer.Strict (runWriter)

4040import qualified Control.Monad.Trans.State.Lazy as L

4141

4242import Options.Applicative as Opts

psci/tests/Main.hs+1−1

@@ -5,7 +5,7 @@ module Main where

55import Control.Monad.Trans.State.Strict (runStateT)

66import Control.Monad (when, forM)

77import Control.Applicative

8−import Control.Monad.Writer (runWriterT)

8+import Control.Monad.Writer.Strict (runWriterT)

99import Control.Monad.Trans.Except (runExceptT)

1010

1111import Data.List (sort)

src/Language/PureScript/Docs/ParseAndDesugar.hs+1−1

@@ -11,7 +11,7 @@ import Control.Monad

1111import Control.Applicative

1212

1313import Control.Monad.Trans.Except

14−import Control.Monad.Writer (runWriterT)

14+import Control.Monad.Writer.Strict (runWriterT)

1515import Control.Monad.Error.Class (MonadError(..))

1616import Control.Monad.IO.Class (MonadIO(..))

1717

src/Language/PureScript/Make.hs+1−1

@@ -41,7 +41,7 @@ import Control.Monad

4141import Control.Monad.Error.Class (MonadError(..))

4242import Control.Monad.Trans.Except

4343import Control.Monad.Reader

44−import Control.Monad.Writer

44+import Control.Monad.Writer.Strict

4545import Control.Monad.Supply

4646

4747import Data.Function (on)

src/Language/PureScript/Publish.hs+1−1

@@ -39,7 +39,7 @@ import Control.Exception (catch, try)

3939import Control.Monad.Trans.Maybe (MaybeT(..), runMaybeT)

4040import Control.Monad.Trans.Except

4141import Control.Monad.Error.Class (MonadError(..))

42−import Control.Monad.Writer

42+import Control.Monad.Writer.Strict

4343

4444import System.Directory (doesFileExist, findExecutable)

4545import System.Process (readProcess)

src/Language/PureScript/TypeChecker/Monad.hs+1−1

@@ -24,7 +24,7 @@ import qualified Data.Map as M

2424import Control.Applicative

2525import Control.Monad.State

2626import Control.Monad.Unify

27−import Control.Monad.Writer

27+import Control.Monad.Writer.Strict

2828import Control.Monad.Error.Class (MonadError(..))

2929import Control.Monad.Trans.Except

3030

stack-lts-3.yaml+1−1

@@ -2,4 +2,4 @@ flags: {}

22packages:

33- '.'

44extra-deps:

5−resolver: lts-3.0

5+resolver: lts-3.1

tests/Main.hs+1−1

@@ -53,7 +53,7 @@ import Control.Applicative

5353import Control.Arrow ((>>>))

5454

5555import Control.Monad.Reader

56−import Control.Monad.Writer

56+import Control.Monad.Writer.Strict

5757import Control.Monad.Trans.Maybe

5858import Control.Monad.Trans.Except

5959import Control.Monad.Error.Class