Replace enclosed-exceptions with safe-exceptions

ChangeLog.md

@@ -77,6 +77,8 @@ Other enhancements:
   [#1521](https://github.com/commercialhaskell/stack/issues/1521)
 * No longer warns about missing build-tools if they are on the PATH.
   [#2235](https://github.com/commercialhaskell/stack/issues/2235)
+* Replace enclosed-exceptions with safe-exceptions.
+  [#2768](https://github.com/commercialhaskell/stack/issues/2768)
 
 Bug fixes:
 

src/Network/HTTP/Download.hs

@@ -25,7 +25,7 @@ module Network.HTTP.Download
     ) where
 
 import           Control.Exception           (Exception)
-import           Control.Exception.Enclosed  (handleIO)
+import           Control.Exception.Safe      (handleIO)
 import           Control.Monad               (void)
 import           Control.Monad.Catch         (MonadMask, throwM)
 import           Control.Monad.IO.Class      (MonadIO, liftIO)

src/Stack/Build/Cache.hs

@@ -33,7 +33,7 @@ module Stack.Build.Cache
 
 import           Control.Applicative
 import           Control.DeepSeq (NFData)
-import           Control.Exception.Enclosed (handleIO, tryAnyDeep)
+import           Control.Exception.Safe (handleIO, tryAnyDeep)
 import           Control.Monad (liftM)
 import           Control.Monad.Catch (MonadThrow, MonadCatch)
 import           Control.Monad.IO.Class

src/Stack/Build/Execute.hs

@@ -23,7 +23,7 @@ import           Control.Arrow ((&&&), second)
 import           Control.Concurrent.Execute
 import           Control.Concurrent.MVar.Lifted
 import           Control.Concurrent.STM
-import           Control.Exception.Enclosed (catchIO)
+import           Control.Exception.Safe (catchIO)
 import           Control.Exception.Lifted
 import           Control.Monad (liftM, when, unless, void)
 import           Control.Monad.Catch (MonadCatch)

src/Stack/Coverage.hs

@@ -17,7 +17,7 @@ module Stack.Coverage
     ) where
 
 import           Control.Applicative
-import           Control.Exception.Enclosed (handleIO)
+import           Control.Exception.Safe (handleIO)
 import           Control.Exception.Lifted
 import           Control.Monad (liftM, when, unless, void, (<=<))
 import           Control.Monad.IO.Class

src/Stack/Fetch.hs

@@ -34,7 +34,7 @@ import              Control.Concurrent.Async (Concurrently (..))
 import              Control.Concurrent.MVar.Lifted (modifyMVar, newMVar)
 import              Control.Concurrent.STM
 import              Control.Exception (assert)
-import              Control.Exception.Enclosed (tryIO)
+import              Control.Exception.Safe (tryIO)
 import              Control.Monad (join, liftM, unless, void, when)
 import              Control.Monad.Catch
 import              Control.Monad.IO.Class

src/Stack/FileWatch.hs

@@ -11,7 +11,7 @@ import Blaze.ByteString.Builder.Char.Utf8 (fromShow)
 import Control.Concurrent.Async (race_)
 import Control.Concurrent.STM
 import Control.Exception (Exception, fromException)
-import Control.Exception.Enclosed (tryAny)
+import Control.Exception.Safe (tryAny)
 import Control.Monad (forever, unless, when)
 import qualified Data.ByteString.Lazy as L
 import qualified Data.Map.Strict as Map

src/Stack/Ghci.hs

@@ -22,7 +22,7 @@ module Stack.Ghci
 
 import           Control.Applicative
 import           Control.Arrow (second)
-import           Control.Exception.Enclosed (tryAny)
+import           Control.Exception.Safe (tryAny)
 import           Control.Monad hiding (forM)
 import           Control.Monad.Catch
 import           Control.Monad.IO.Class

src/Stack/Init.hs

@@ -9,7 +9,7 @@ module Stack.Init
     ) where
 
 import           Control.Exception (assert)
-import           Control.Exception.Enclosed (catchAny)
+import           Control.Exception.Safe (catchAny)
 import           Control.Monad
 import           Control.Monad.Catch (throwM)
 import           Control.Monad.IO.Class

src/Stack/PackageDump.hs

@@ -25,7 +25,7 @@ module Stack.PackageDump
 
 import           Control.Applicative
 import           Control.Arrow ((&&&))
-import           Control.Exception.Enclosed (tryIO)
+import           Control.Exception.Safe (tryIO)
 import           Control.Monad (liftM)
 import           Control.Monad.Catch
 import           Control.Monad.IO.Class

src/Stack/PackageIndex.hs

@@ -29,7 +29,7 @@ module Stack.PackageIndex
 
 import qualified Codec.Archive.Tar as Tar
 import           Control.Exception (Exception)
-import           Control.Exception.Enclosed (tryIO)
+import           Control.Exception.Safe (tryIO)
 import           Control.Monad (unless, when, liftM, void)
 import           Control.Monad.Catch (throwM)
 import qualified Control.Monad.Catch as C

src/Stack/Setup.hs

@@ -24,7 +24,7 @@ module Stack.Setup
 
 import              Control.Applicative
 import              Control.Concurrent.Async.Lifted (Concurrently(..))
-import              Control.Exception.Enclosed (catchIO, tryAny)
+import              Control.Exception.Safe (catchIO, tryAny)
 import              Control.Monad (liftM, when, join, void, unless)
 import              Control.Monad.Catch
 import              Control.Monad.IO.Class (MonadIO, liftIO)

src/Stack/Solver.hs

@@ -22,7 +22,7 @@ import           Prelude.Compat
 
 import           Control.Applicative
 import           Control.Exception (assert)
-import           Control.Exception.Enclosed (tryIO)
+import           Control.Exception.Safe (tryIO)
 import           Control.Monad (when,void,join,liftM,unless,mapAndUnzipM, zipWithM_)
 import           Control.Monad.Catch
 import           Control.Monad.IO.Class

stack-7.8.yaml

@@ -76,6 +76,7 @@ extra-deps:
 - text-metrics-0.1.0
 - pid1-0.1.0.0
 - file-embed-0.0.10
+- safe-exceptions-0.1.4.0
 flags:
   time-locale-compat:
     old-locale: false

stack.cabal

@@ -199,7 +199,6 @@ library
                    , cryptohash-conduit
                    , directory >= 1.2.1.0
                    , either
-                   , enclosed-exceptions
                    , errors < 2.2
                    , exceptions >= 0.8.0.2
                    , extra < 1.6
@@ -238,6 +237,7 @@ library
                    , resourcet >= 1.1.4.1
                    , retry >= 0.6 && < 0.8
                    , safe >= 0.3
+                   , safe-exceptions
                    , semigroups >= 0.5 && < 0.19
                    , split
                    , stm >= 2.4.4