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

hdgarrood · hdgarrood · commit 45386876236c · 2015-02-20T01:21:43.000Z
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.
diff --git a/psc/Main.hs b/psc/Main.hs
@@ -17,7 +17,7 @@
 module Main where
 
 import Control.Applicative
-import Control.Monad.Error
+import Control.Monad.Except
 import Control.Monad.Reader
 
 import Data.Maybe (fromMaybe)
diff --git a/src/Language/PureScript.hs b/src/Language/PureScript.hs
@@ -29,7 +29,7 @@ import qualified Data.Set as S
 
 import Control.Applicative
 import Control.Arrow ((&&&))
-import Control.Monad.Error
+import Control.Monad.Except
 import Control.Monad.Reader
 
 import System.FilePath ((</>))
diff --git a/src/Language/PureScript/Errors.hs b/src/Language/PureScript/Errors.hs
@@ -20,7 +20,8 @@ import Data.Either (lefts, rights)
 import Data.List (intersperse, intercalate)
 import Data.Monoid
 
-import Control.Monad.Error
+import Control.Monad.Except
+import Control.Monad.Error (Error(..))
 import Control.Applicative ((<$>))
 
 import Language.PureScript.AST
diff --git a/src/Language/PureScript/ModuleDependencies.hs b/src/Language/PureScript/ModuleDependencies.hs
@@ -19,7 +19,7 @@ module Language.PureScript.ModuleDependencies (
   ModuleGraph
 ) where
 
-import Control.Monad.Error.Class
+import Control.Monad.Except
 
 import Data.Graph
 import Data.List (nub)
diff --git a/src/Language/PureScript/Sugar/CaseDeclarations.hs b/src/Language/PureScript/Sugar/CaseDeclarations.hs
@@ -24,7 +24,8 @@ import Data.List (nub, groupBy)
 
 import Control.Applicative
 import Control.Monad ((<=<), forM, join, unless, replicateM)
-import Control.Monad.Error.Class
+import Control.Monad.Except
+import Control.Monad.Error (Error(..))
 
 import Language.PureScript.Names
 import Language.PureScript.AST
diff --git a/src/Language/PureScript/Sugar/Names.hs b/src/Language/PureScript/Sugar/Names.hs
@@ -21,7 +21,8 @@ import Data.Maybe (fromMaybe, isJust, mapMaybe)
 import Data.Monoid ((<>))
 
 import Control.Applicative (Applicative(..), (<$>), (<*>))
-import Control.Monad.Error
+import Control.Monad.Except
+import Control.Monad.Error (Error(..))
 
 import qualified Data.Map as M
 
diff --git a/src/Language/PureScript/Sugar/Operators.hs b/src/Language/PureScript/Sugar/Operators.hs
@@ -32,7 +32,8 @@ import Language.PureScript.Supply
 
 import Control.Applicative
 import Control.Monad.State
-import Control.Monad.Error.Class
+import Control.Monad.Except
+import Control.Monad.Error (Error(..))
 
 import Data.Monoid ((<>))
 import Data.Function (on)
diff --git a/src/Language/PureScript/Sugar/TypeClasses.hs b/src/Language/PureScript/Sugar/TypeClasses.hs
@@ -34,7 +34,8 @@ import qualified Language.PureScript.Constants as C
 
 import Control.Applicative
 import Control.Arrow (first, second)
-import Control.Monad.Error
+import Control.Monad.Except
+import Control.Monad.Error (Error(..))
 import Control.Monad.State
 import Data.List ((\\), find)
 import Data.Maybe (catMaybes, mapMaybe, isJust)
diff --git a/src/Language/PureScript/Sugar/TypeDeclarations.hs b/src/Language/PureScript/Sugar/TypeDeclarations.hs
@@ -22,7 +22,8 @@ module Language.PureScript.Sugar.TypeDeclarations (
 import Data.Monoid ((<>))
 
 import Control.Applicative
-import Control.Monad.Error.Class
+import Control.Monad.Except
+import Control.Monad.Error (Error(..))
 import Control.Monad (forM)
 
 import Language.PureScript.AST
diff --git a/src/Language/PureScript/Supply.hs b/src/Language/PureScript/Supply.hs
@@ -24,7 +24,7 @@ import Data.Functor.Identity
 
 import Control.Applicative
 import Control.Monad.State
-import Control.Monad.Error.Class
+import Control.Monad.Except
 
 newtype SupplyT m a = SupplyT { unSupplyT :: StateT Integer m a } deriving (Functor, Applicative, Monad, MonadTrans)
 
diff --git a/src/Language/PureScript/TypeChecker.hs b/src/Language/PureScript/TypeChecker.hs
@@ -32,7 +32,8 @@ import Data.Foldable (for_)
 import qualified Data.Map as M
 
 import Control.Monad.State
-import Control.Monad.Error
+import Control.Monad.Except
+import Control.Monad.Error (Error(..))
 
 import Language.PureScript.Types
 import Language.PureScript.Names
diff --git a/src/Language/PureScript/TypeChecker/Entailment.hs b/src/Language/PureScript/TypeChecker/Entailment.hs
@@ -25,7 +25,8 @@ import qualified Data.Map as M
 
 import Control.Applicative
 import Control.Arrow (Arrow(..))
-import Control.Monad.Error
+import Control.Monad.Except
+import Control.Monad.Error (Error(..))
 
 import Language.PureScript.AST
 import Language.PureScript.Environment
diff --git a/src/Language/PureScript/TypeChecker/Kinds.hs b/src/Language/PureScript/TypeChecker/Kinds.hs
@@ -31,7 +31,8 @@ import qualified Data.Map as M
 
 import Control.Arrow (second)
 import Control.Applicative
-import Control.Monad.Error
+import Control.Monad.Except
+import Control.Monad.Error (Error(..))
 import Control.Monad.State
 import Control.Monad.Unify
 
diff --git a/src/Language/PureScript/TypeChecker/Monad.hs b/src/Language/PureScript/TypeChecker/Monad.hs
@@ -22,7 +22,8 @@ import Data.Maybe
 import qualified Data.Map as M
 
 import Control.Applicative
-import Control.Monad.Error
+import Control.Monad.Except
+import Control.Monad.Error (Error(..))
 import Control.Monad.Reader.Class
 import Control.Monad.State
 import Control.Monad.Unify
diff --git a/src/Language/PureScript/TypeChecker/Rows.hs b/src/Language/PureScript/TypeChecker/Rows.hs
@@ -19,7 +19,7 @@ module Language.PureScript.TypeChecker.Rows (
 
 import Data.List
 
-import Control.Monad.Error
+import Control.Monad.Except
 
 import Language.PureScript.AST
 import Language.PureScript.Errors
diff --git a/src/Language/PureScript/TypeChecker/Skolems.hs b/src/Language/PureScript/TypeChecker/Skolems.hs
@@ -26,7 +26,7 @@ import Data.List (nub, (\\))
 import Data.Monoid
 
 import Control.Applicative
-import Control.Monad.Error
+import Control.Monad.Except
 import Control.Monad.Unify
 
 import Language.PureScript.AST
diff --git a/src/Language/PureScript/TypeChecker/Subsumption.hs b/src/Language/PureScript/TypeChecker/Subsumption.hs
@@ -22,7 +22,8 @@ import Data.Monoid
 import Data.Ord (comparing)
 
 import Control.Applicative
-import Control.Monad.Error
+import Control.Monad.Except
+import Control.Monad.Error (Error(..))
 import Control.Monad.Unify
 
 import Language.PureScript.AST
diff --git a/src/Language/PureScript/TypeChecker/Synonyms.hs b/src/Language/PureScript/TypeChecker/Synonyms.hs
@@ -28,7 +28,8 @@ import Data.Maybe (fromMaybe)
 import qualified Data.Map as M
 
 import Control.Applicative
-import Control.Monad.Error
+import Control.Monad.Except
+import Control.Monad.Error (Error(..))
 import Control.Monad.State
 
 import Language.PureScript.Environment
diff --git a/src/Language/PureScript/TypeChecker/Types.hs b/src/Language/PureScript/TypeChecker/Types.hs
@@ -42,7 +42,8 @@ import Data.Monoid
 import qualified Data.Map as M
 
 import Control.Applicative
-import Control.Monad.Error
+import Control.Monad.Except
+import Control.Monad.Error (Error(..))
 import Control.Monad.State
 import Control.Monad.Unify
 
diff --git a/src/Language/PureScript/TypeChecker/Unify.hs b/src/Language/PureScript/TypeChecker/Unify.hs
@@ -30,7 +30,8 @@ import Data.Maybe (fromMaybe)
 import Data.Monoid
 import qualified Data.HashMap.Strict as H
 
-import Control.Monad.Error
+import Control.Monad.Except
+import Control.Monad.Error (Error(..))
 import Control.Monad.Unify
 
 import Language.PureScript.Environment
