06598c8 · rowtype-yoga/purescript-native

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

Relax the lower bound on transformers

Replace all use of Control.Monad.Except with one or more of: * Control.Monad * Control.Monad.Error.Class * Control.Monad.Trans.Except Also add transformers-compat to purescript.cabal

commit06598c8b29a6af4af1f75f15277f175d8c9615c2 authorHarry Garrood <harry@garrood.me> dateWed 15 Apr 2015, 08:30 (12 years ago) parentc1fe331

28 files changed+46−35

compare with golang

unifiedsplit

psc-make/Main.hs+3−1

@@ -17,7 +17,9 @@

1717module Main where

1818

1919import Control.Applicative

20−import Control.Monad.Except

20+import Control.Monad

21+import Control.Monad.Error.Class (MonadError(..))

22+import Control.Monad.Trans.Except

2123import Control.Monad.Reader

2224

2325import Data.Version (showVersion)

psc/Main.hs+1−1

@@ -17,7 +17,7 @@

1717module Main where

1818

1919import Control.Applicative

20−import Control.Monad.Except

20+import Control.Monad

2121import Control.Monad.Reader

2222

2323import Data.Maybe (fromMaybe)

psci/PSCi.hs+2−2

@@ -30,8 +30,8 @@ import qualified Data.Map as M

3030import Control.Applicative

3131import Control.Monad

3232import Control.Monad.IO.Class (MonadIO, liftIO)

33−import Control.Monad.Error.Class (throwError)

34−import Control.Monad.Except (ExceptT(..), MonadError, runExceptT)

33+import Control.Monad.Error.Class (MonadError(..))

34+import Control.Monad.Trans.Except (ExceptT(..), runExceptT)

3535import Control.Monad.Reader (MonadReader, ReaderT, runReaderT)

3636import Control.Monad.Trans.Class

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

purescript.cabal+5−4

@@ -31,7 +31,8 @@ library

3131 filepath -any,

3232 mtl >= 2.1.0 && < 2.3.0,

3333 parsec -any,

34− transformers >= 0.4.0 && < 0.5,

34+ transformers >= 0.3.0 && < 0.5,

35+ transformers-compat >= 0.3.0,

3536 utf8-string >= 1 && < 2,

3637 pattern-arrows >= 0.0.2 && < 0.1,

3738 file-embed >= 0.0.7 && < 0.0.8,

@@ -133,7 +134,7 @@ executable psc

133134executable psc-make

134135 build-depends: base >=4 && <5, containers -any, directory -any, filepath -any,

135136 mtl -any, optparse-applicative >= 0.10.0, parsec -any, purescript -any,

136− transformers -any

137+ transformers -any, transformers-compat -any

137138 main-is: Main.hs

138139 buildable: True

139140 hs-source-dirs: psc-make

@@ -144,7 +145,7 @@ executable psci

144145 build-depends: base >=4 && <5, containers -any, directory -any, filepath -any,

145146 mtl -any, optparse-applicative >= 0.10.0, parsec -any,

146147 haskeline >= 0.7.0.0, purescript -any, transformers -any,

147− process -any

148+ transformers-compat -any, process -any

148149

149150 main-is: Main.hs

150151 buildable: True

@@ -189,7 +190,7 @@ test-suite psci-tests

189190 build-depends: base >=4 && <5, containers -any, directory -any, filepath -any,

190191 mtl -any, optparse-applicative >= 0.10.0, parsec -any,

191192 haskeline >= 0.7.0.0, purescript -any, transformers -any,

192− process -any, HUnit -any

193+ transformers-compat -any, process -any, HUnit -any

193194 type: exitcode-stdio-1.0

194195 main-is: Main.hs

195196 buildable: True

src/Control/Monad/Supply.hs+2−2

@@ -21,7 +21,7 @@ import Data.Functor.Identity

2121

2222import Control.Applicative

2323import Control.Monad.State

24−import Control.Monad.Except

24+import Control.Monad.Error.Class (MonadError(..))

2525import Control.Monad.Reader

2626import Control.Monad.Writer

2727

@@ -40,4 +40,4 @@ runSupply :: Integer -> Supply a -> (a, Integer)

4040runSupply n = runIdentity . runSupplyT n

4141

4242evalSupply :: Integer -> Supply a -> a

43−evalSupply n = runIdentity . evalSupplyT n

43+evalSupply n = runIdentity . evalSupplyT n

src/Control/Monad/Unify.hs+1−1

@@ -27,7 +27,7 @@ import Data.Monoid

2727

2828import Control.Applicative

2929import Control.Monad.State

30−import Control.Monad.Error.Class

30+import Control.Monad.Error.Class (MonadError(..))

3131

3232import Data.HashMap.Strict as M

3333

src/Language/PureScript.hs+2−1

@@ -43,7 +43,8 @@ import qualified Data.Set as S

4343

4444import Control.Applicative

4545import Control.Arrow ((&&&))

46−import Control.Monad.Except

46+import Control.Monad

47+import Control.Monad.Error.Class (MonadError(..))

4748import Control.Monad.Reader

4849

4950import System.FilePath ((</>))

src/Language/PureScript/Errors.hs+2−1

@@ -23,7 +23,8 @@ import Data.List (intercalate)

2323import Data.Monoid

2424import Data.Foldable (fold, foldMap)

2525

26−import Control.Monad.Except

26+import Control.Monad

27+import Control.Monad.Error.Class (MonadError(..))

2728import Control.Monad.Unify

2829import Control.Applicative ((<$>))

2930

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

@@ -19,7 +19,7 @@ module Language.PureScript.ModuleDependencies (

1919 ModuleGraph

2020) where

2121

22−import Control.Monad.Except

22+import Control.Monad.Error.Class (MonadError(..))

2323

2424import Data.Graph

2525import Data.List (nub)

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

@@ -20,7 +20,7 @@ module Language.PureScript.Sugar (desugar, module S) where

2020import Control.Monad

2121import Control.Category ((>>>))

2222import Control.Applicative

23−import Control.Monad.Error.Class

23+import Control.Monad.Error.Class (MonadError(..))

2424import Control.Monad.Supply.Class

2525

2626import Language.PureScript.AST

src/Language/PureScript/Sugar/BindingGroups.hs+1−1

@@ -28,7 +28,7 @@ import Data.List (nub, intersect)

2828import Data.Maybe (isJust, mapMaybe)

2929import Control.Applicative

3030import Control.Monad ((<=<))

31−import Control.Monad.Error.Class

31+import Control.Monad.Error.Class (MonadError(..))

3232

3333import qualified Data.Set as S

3434

src/Language/PureScript/Sugar/CaseDeclarations.hs+1−2

@@ -26,8 +26,7 @@ import Data.List (nub, groupBy)

2626

2727import Control.Applicative

2828import Control.Monad ((<=<), forM, replicateM, join, unless)

29−import Control.Monad.Except (throwError)

30−import Control.Monad.Error.Class (MonadError)

29+import Control.Monad.Error.Class (MonadError(..))

3130import Control.Monad.Supply.Class

3231

3332import Language.PureScript.Names

src/Language/PureScript/Sugar/DoNotation.hs+1−1

@@ -28,7 +28,7 @@ import Language.PureScript.Errors

2828import qualified Language.PureScript.Constants as C

2929

3030import Control.Applicative

31−import Control.Monad.Error.Class

31+import Control.Monad.Error.Class (MonadError(..))

3232import Control.Monad.Supply.Class

3333

3434-- |

src/Language/PureScript/Sugar/Names.hs+2−1

@@ -23,7 +23,8 @@ import Data.List (nub)

2323import Data.Maybe (fromMaybe, isJust, mapMaybe)

2424

2525import Control.Applicative (Applicative(..), (<$>), (<*>))

26−import Control.Monad.Except

26+import Control.Monad

27+import Control.Monad.Error.Class (MonadError(..))

2728

2829import qualified Data.Map as M

2930

src/Language/PureScript/Sugar/ObjectWildcards.hs+1−1

@@ -21,7 +21,7 @@ module Language.PureScript.Sugar.ObjectWildcards (

2121

2222import Control.Applicative

2323import Control.Arrow (second)

24−import Control.Monad.Error.Class

24+import Control.Monad.Error.Class (MonadError(..))

2525import Control.Monad.Supply.Class

2626

2727import Data.List (partition)

src/Language/PureScript/Sugar/Operators.hs+1−1

@@ -33,7 +33,7 @@ import Language.PureScript.Names

3333

3434import Control.Applicative

3535import Control.Monad.State

36−import Control.Monad.Except

36+import Control.Monad.Error.Class (MonadError(..))

3737import Control.Monad.Supply.Class

3838

3939import Data.Function (on)

src/Language/PureScript/Sugar/TypeClasses.hs+1−1

@@ -35,7 +35,7 @@ import qualified Language.PureScript.Constants as C

3535

3636import Control.Applicative

3737import Control.Arrow (first, second)

38−import Control.Monad.Except

38+import Control.Monad.Error.Class (MonadError(..))

3939import Control.Monad.State

4040import Data.List ((\\), find, sortBy)

4141import Data.Maybe (catMaybes, mapMaybe, isJust)

src/Language/PureScript/Sugar/TypeDeclarations.hs+1−2

@@ -23,8 +23,7 @@ module Language.PureScript.Sugar.TypeDeclarations (

2323

2424import Control.Applicative

2525import Control.Monad (forM)

26−import Control.Monad.Except (throwError)

27−import Control.Monad.Error.Class (MonadError)

26+import Control.Monad.Error.Class (MonadError(..))

2827

2928import Language.PureScript.AST

3029import Language.PureScript.Names

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

@@ -32,7 +32,7 @@ import Data.Foldable (for_)

3232import qualified Data.Map as M

3333

3434import Control.Monad.State

35−import Control.Monad.Except

35+import Control.Monad.Error.Class (MonadError(..))

3636

3737import Language.PureScript.Types

3838import Language.PureScript.Names

src/Language/PureScript/TypeChecker/Entailment.hs+2−1

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

2525

2626import Control.Applicative

2727import Control.Arrow (Arrow(..))

28−import Control.Monad.Except

28+import Control.Monad

29+import Control.Monad.Error.Class (MonadError(..))

2930

3031import Language.PureScript.AST

3132import Language.PureScript.Errors

src/Language/PureScript/TypeChecker/Kinds.hs+2−1

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

3030

3131import Control.Arrow (second)

3232import Control.Applicative

33−import Control.Monad.Except

33+import Control.Monad

34+import Control.Monad.Error.Class (MonadError(..))

3435import Control.Monad.State

3536import Control.Monad.Unify

3637

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

@@ -22,7 +22,7 @@ import Data.Maybe

2222import qualified Data.Map as M

2323

2424import Control.Applicative

25−import Control.Monad.Except

25+import Control.Monad.Error.Class (MonadError(..))

2626import Control.Monad.State

2727import Control.Monad.Unify

2828

src/Language/PureScript/TypeChecker/Rows.hs+2−1

@@ -19,7 +19,8 @@ module Language.PureScript.TypeChecker.Rows (

1919

2020import Data.List

2121

22−import Control.Monad.Except

22+import Control.Monad

23+import Control.Monad.Error.Class (MonadError(..))

2324

2425import Language.PureScript.AST

2526import Language.PureScript.Errors

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

@@ -26,7 +26,7 @@ import Data.List (nub, (\\))

2626import Data.Monoid

2727

2828import Control.Applicative

29−import Control.Monad.Except

29+import Control.Monad.Error.Class (MonadError(..))

3030import Control.Monad.Unify

3131

3232import Language.PureScript.AST

src/Language/PureScript/TypeChecker/Subsumption.hs+2−1

@@ -20,7 +20,8 @@ module Language.PureScript.TypeChecker.Subsumption (

2020import Data.List (sortBy)

2121import Data.Ord (comparing)

2222

23−import Control.Monad.Except

23+import Control.Monad

24+import Control.Monad.Error.Class (MonadError(..))

2425import Control.Monad.Unify

2526

2627import Language.PureScript.AST

src/Language/PureScript/TypeChecker/Synonyms.hs+2−1

@@ -28,7 +28,8 @@ import Data.Maybe (fromMaybe)

2828import qualified Data.Map as M

2929

3030import Control.Applicative

31−import Control.Monad.Except

31+import Control.Monad

32+import Control.Monad.Error.Class (MonadError(..))

3233import Control.Monad.State

3334

3435import Language.PureScript.Environment

src/Language/PureScript/TypeChecker/Types.hs+2−1

@@ -41,7 +41,8 @@ import Data.Maybe (fromMaybe)

4141import qualified Data.Map as M

4242

4343import Control.Applicative

44−import Control.Monad.Except

44+import Control.Monad

45+import Control.Monad.Error.Class (MonadError(..))

4546import Control.Monad.State

4647import Control.Monad.Unify

4748

src/Language/PureScript/TypeChecker/Unify.hs+2−1

@@ -29,7 +29,8 @@ import Data.List (nub, sort)

2929import Data.Maybe (fromMaybe)

3030import qualified Data.HashMap.Strict as H

3131

32−import Control.Monad.Except

32+import Control.Monad

33+import Control.Monad.Error.Class (MonadError(..))

3334import Control.Monad.Unify

3435

3536import Language.PureScript.Environment