From ffd7b7944375a0c7a0039f2e1c324e59c67266d8 Mon Sep 17 00:00:00 2001 From: Vladislav Sabanov Date: Fri, 23 May 2025 23:43:10 -0300 Subject: [PATCH] Swap safe-exceptions with Kmett's exceptions --- lineman.cabal | 2 +- src/App.hs | 4 ++-- src/Lineman.hs | 2 +- src/Log.hs | 2 +- src/Types.hs | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lineman.cabal b/lineman.cabal index f49303c..26581bc 100644 --- a/lineman.cabal +++ b/lineman.cabal @@ -73,7 +73,7 @@ library , path-io , pretty-simple , process - , safe-exceptions + , exceptions , text , transformers-base diff --git a/src/App.hs b/src/App.hs index 6ed622d..fbff0cc 100644 --- a/src/App.hs +++ b/src/App.hs @@ -8,7 +8,7 @@ import Log (mkLogEnv) import Types (App (unApp), Config (..), Env (..)) import Control.Concurrent.Async.Lifted (forConcurrently) -import Control.Exception.Safe (throwIO, tryAny) +import Control.Exception (throwIO, try, SomeException) import Control.Monad (forM, when) import Control.Monad.Reader (ReaderT (..)) import Dhall (auto, inputFile) @@ -46,7 +46,7 @@ runApp env app = runReaderT (unApp app) env getConfig :: FilePath -> IO Config getConfig path = do - eConfig :: Either a Config <- tryAny $ inputFile auto path + eConfig :: Either SomeException Config <- try $ inputFile auto path case eConfig of Left err -> do pPrintString "Config parsing failed" diff --git a/src/Lineman.hs b/src/Lineman.hs index b9d7d1e..038c608 100644 --- a/src/Lineman.hs +++ b/src/Lineman.hs @@ -8,7 +8,7 @@ import Cook (prepareConditions) import Log (logDebug, logError, logInfo) import Types (App, Env (..)) -import Control.Exception.Safe (try) +import Control.Exception (try) import Control.Monad (forM_) import qualified Control.Monad.Extra as E import Control.Monad.IO.Class (liftIO) diff --git a/src/Log.hs b/src/Log.hs index c51f500..28328c7 100644 --- a/src/Log.hs +++ b/src/Log.hs @@ -16,7 +16,7 @@ module Log ( ) where -import Control.Exception.Safe (bracket) +import Control.Exception (bracket) import Data.Text (Text) import Data.Text.Lazy.Builder (fromString, fromText) import Katip diff --git a/src/Types.hs b/src/Types.hs index 74d461c..269ab45 100644 --- a/src/Types.hs +++ b/src/Types.hs @@ -21,7 +21,7 @@ module Types ( ActionMode, ) where -import Control.Exception.Safe (MonadCatch, MonadMask, MonadThrow) +import Control.Monad.Catch (MonadCatch, MonadMask, MonadThrow) import Control.Monad.Base (MonadBase) import Control.Monad.IO.Class (MonadIO) import Control.Monad.Reader (