From 7be42508a596fc2caf55fc0a6596857fb7d60253 Mon Sep 17 00:00:00 2001 From: Félix Sipma Date: Mon, 20 Jun 2016 12:33:49 +0200 Subject: Exception: import Control.Applicative (old ghc compatibility) --- src/Propellor/Exception.hs | 1 + 1 file changed, 1 insertion(+) (limited to 'src/Propellor/Exception.hs') diff --git a/src/Propellor/Exception.hs b/src/Propellor/Exception.hs index 3ab783bf..c6eee099 100644 --- a/src/Propellor/Exception.hs +++ b/src/Propellor/Exception.hs @@ -10,6 +10,7 @@ import Utility.Exception import Control.Exception (AsyncException) import Control.Monad.Catch import Control.Monad.IO.Class (MonadIO) +import Control.Applicative -- | Catches all exceptions (except for `StopPropellorException` and -- `AsyncException`) and returns FailedChange. -- cgit v1.3-2-g0d8e From c10ec2d3eb3b4195cc0d2234d2ac227dbd43629c Mon Sep 17 00:00:00 2001 From: Félix Sipma Date: Mon, 20 Jun 2016 12:35:52 +0200 Subject: Exception: import Prelude after Control.Applicative to prevent warning --- src/Propellor/Exception.hs | 1 + 1 file changed, 1 insertion(+) (limited to 'src/Propellor/Exception.hs') diff --git a/src/Propellor/Exception.hs b/src/Propellor/Exception.hs index c6eee099..b297a740 100644 --- a/src/Propellor/Exception.hs +++ b/src/Propellor/Exception.hs @@ -11,6 +11,7 @@ import Control.Exception (AsyncException) import Control.Monad.Catch import Control.Monad.IO.Class (MonadIO) import Control.Applicative +import Prelude -- | Catches all exceptions (except for `StopPropellorException` and -- `AsyncException`) and returns FailedChange. -- cgit v1.3-2-g0d8e From c5a1503c0c2eb1974e6d3491db61ed75ce2ddd61 Mon Sep 17 00:00:00 2001 From: Félix Sipma Date: Mon, 20 Jun 2016 16:25:34 +0200 Subject: Exception: prevent use of Control.Applicative (ghc compatibility) --- src/Propellor/Exception.hs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/Propellor/Exception.hs') diff --git a/src/Propellor/Exception.hs b/src/Propellor/Exception.hs index b297a740..49977370 100644 --- a/src/Propellor/Exception.hs +++ b/src/Propellor/Exception.hs @@ -10,7 +10,6 @@ import Utility.Exception import Control.Exception (AsyncException) import Control.Monad.Catch import Control.Monad.IO.Class (MonadIO) -import Control.Applicative import Prelude -- | Catches all exceptions (except for `StopPropellorException` and @@ -30,4 +29,4 @@ catchPropellor' a onerr = a `catches` -- | Catches all exceptions (except for `StopPropellorException` and -- `AsyncException`). tryPropellor :: MonadCatch m => m a -> m (Either SomeException a) -tryPropellor a = (Right <$> a) `catchPropellor'` (pure . Left) +tryPropellor a = fmap Right a `catchPropellor'` (return . Left) -- cgit v1.3-2-g0d8e From e0471e95ea3f3429eab57378712aab7e9794acb5 Mon Sep 17 00:00:00 2001 From: Félix Sipma Date: Mon, 20 Jun 2016 16:30:24 +0200 Subject: Exception: prevent use of Functor --- src/Propellor/Exception.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Propellor/Exception.hs') diff --git a/src/Propellor/Exception.hs b/src/Propellor/Exception.hs index 49977370..b62c558a 100644 --- a/src/Propellor/Exception.hs +++ b/src/Propellor/Exception.hs @@ -29,4 +29,4 @@ catchPropellor' a onerr = a `catches` -- | Catches all exceptions (except for `StopPropellorException` and -- `AsyncException`). tryPropellor :: MonadCatch m => m a -> m (Either SomeException a) -tryPropellor a = fmap Right a `catchPropellor'` (return . Left) +tryPropellor a = (return . Right =<< a) `catchPropellor'` (return . Left) -- cgit v1.3-2-g0d8e