git.iko.soy/obelisk
on master help sign in
No need for standalone deriving here
cc9aa19Sridhar Ratnakumar
lib/command/src/Obelisk/App.hs+1−6
compare with master
unifiedsplit
@@ -2,7 +2,6 @@
2{-# LANGUAGE FlexibleContexts #-}
2{-# LANGUAGE FlexibleContexts #-}
3{-# LANGUAGE GeneralizedNewtypeDeriving #-}
3{-# LANGUAGE GeneralizedNewtypeDeriving #-}
4{-# LANGUAGE MultiParamTypeClasses #-}
4{-# LANGUAGE MultiParamTypeClasses #-}
5−{-# LANGUAGE StandaloneDeriving #-}
6module Obelisk.App where
5module Obelisk.App where
7
6
8import Control.Monad.Catch (MonadCatch, MonadMask, MonadThrow)
7import Control.Monad.Catch (MonadCatch, MonadMask, MonadThrow)
@@ -19,11 +18,7 @@ data Obelisk = Obelisk
19newtype ObeliskT m a = ObeliskT
18newtype ObeliskT m a = ObeliskT
20 { unObeliskT :: ReaderT Obelisk (LoggingT Output m) a
19 { unObeliskT :: ReaderT Obelisk (LoggingT Output m) a
21 }
20 }
22− deriving (Functor, Applicative, Monad, MonadIO)
21+ deriving (Functor, Applicative, Monad, MonadIO, MonadThrow, MonadCatch, MonadMask)
23−
24−deriving instance MonadThrow m => MonadThrow (ObeliskT m)
25−deriving instance MonadCatch m => MonadCatch (ObeliskT m)
26−deriving instance MonadMask m => MonadMask (ObeliskT m)
27
22
28runObelisk :: MonadIO m => Obelisk -> ObeliskT m a -> m a
23runObelisk :: MonadIO m => Obelisk -> ObeliskT m a -> m a
29runObelisk c =
24runObelisk c =