4538687 · rowtype-yoga/purescript-native

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

Use Control.Monad.{Error => Except} where possible

This commit changes all modules that import Control.Monad.Error, apart from those that use the Error typeclass, to import Control.Monad.Except instead. Now, modules will only import Control.Monad.Error if they use the Error typeclass, so it's easy to grep to see which ones those are.

commit45386876236c25e33ed563cf3be50f93be432ad1 authorHarry Garrood <harry@garrood.me> dateThu 19 Feb 2015, 22:15 (12 years ago) parente005ea0

20 files changed+34−20

compare with golang

unifiedsplit

psc/Main.hs+1−1

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

1717module Main where

1818

1919import Control.Applicative

20−import Control.Monad.Error

20+import Control.Monad.Except

2121import Control.Monad.Reader

2222

2323import Data.Maybe (fromMaybe)

src/Language/PureScript.hs+1−1

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

2929

3030import Control.Applicative

3131import Control.Arrow ((&&&))

32−import Control.Monad.Error

32+import Control.Monad.Except

3333import Control.Monad.Reader

3434

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

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

@@ -20,7 +20,8 @@ import Data.Either (lefts, rights)

2020import Data.List (intersperse, intercalate)

2121import Data.Monoid

2222

23−import Control.Monad.Error

23+import Control.Monad.Except

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

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

2526

2627import Language.PureScript.AST

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

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

1919 ModuleGraph

2020) where

2121

22−import Control.Monad.Error.Class

22+import Control.Monad.Except

2323

2424import Data.Graph

2525import Data.List (nub)

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

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

2424

2525import Control.Applicative

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

27−import Control.Monad.Error.Class

27+import Control.Monad.Except

28+import Control.Monad.Error (Error(..))

2829

2930import Language.PureScript.Names

3031import Language.PureScript.AST

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

@@ -21,7 +21,8 @@ import Data.Maybe (fromMaybe, isJust, mapMaybe)

2121import Data.Monoid ((<>))

2222

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

24−import Control.Monad.Error

24+import Control.Monad.Except

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

2526

2627import qualified Data.Map as M

2728

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

@@ -32,7 +32,8 @@ import Language.PureScript.Supply

3232

3333import Control.Applicative

3434import Control.Monad.State

35−import Control.Monad.Error.Class

35+import Control.Monad.Except

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

3637

3738import Data.Monoid ((<>))

3839import Data.Function (on)

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

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

3434

3535import Control.Applicative

3636import Control.Arrow (first, second)

37−import Control.Monad.Error

37+import Control.Monad.Except

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

3839import Control.Monad.State

3940import Data.List ((\\), find)

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

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

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

2222import Data.Monoid ((<>))

2323

2424import Control.Applicative

25−import Control.Monad.Error.Class

25+import Control.Monad.Except

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

2627import Control.Monad (forM)

2728

2829import Language.PureScript.AST

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

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

2424

2525import Control.Applicative

2626import Control.Monad.State

27−import Control.Monad.Error.Class

27+import Control.Monad.Except

2828

2929newtype SupplyT m a = SupplyT { unSupplyT :: StateT Integer m a } deriving (Functor, Applicative, Monad, MonadTrans)

3030

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

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

3232import qualified Data.Map as M

3333

3434import Control.Monad.State

35−import Control.Monad.Error

35+import Control.Monad.Except

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

3637

3738import Language.PureScript.Types

3839import 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.Error

28+import Control.Monad.Except

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

2930

3031import Language.PureScript.AST

3132import Language.PureScript.Environment

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

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

3131

3232import Control.Arrow (second)

3333import Control.Applicative

34−import Control.Monad.Error

34+import Control.Monad.Except

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

3536import Control.Monad.State

3637import Control.Monad.Unify

3738

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

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

2222import qualified Data.Map as M

2323

2424import Control.Applicative

25−import Control.Monad.Error

25+import Control.Monad.Except

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

2627import Control.Monad.Reader.Class

2728import Control.Monad.State

2829import Control.Monad.Unify

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

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

1919

2020import Data.List

2121

22−import Control.Monad.Error

22+import Control.Monad.Except

2323

2424import Language.PureScript.AST

2525import 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.Error

29+import Control.Monad.Except

3030import Control.Monad.Unify

3131

3232import Language.PureScript.AST

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

@@ -22,7 +22,8 @@ import Data.Monoid

2222import Data.Ord (comparing)

2323

2424import Control.Applicative

25−import Control.Monad.Error

25+import Control.Monad.Except

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

2627import Control.Monad.Unify

2728

2829import 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.Error

31+import Control.Monad.Except

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

3233import Control.Monad.State

3334

3435import Language.PureScript.Environment

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

@@ -42,7 +42,8 @@ import Data.Monoid

4242import qualified Data.Map as M

4343

4444import Control.Applicative

45−import Control.Monad.Error

45+import Control.Monad.Except

46+import Control.Monad.Error (Error(..))

4647import Control.Monad.State

4748import Control.Monad.Unify

4849

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

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

3030import Data.Monoid

3131import qualified Data.HashMap.Strict as H

3232

33−import Control.Monad.Error

33+import Control.Monad.Except

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

3435import Control.Monad.Unify

3536

3637import Language.PureScript.Environment