From 3cf472dcf51a83a8a8ba404529c78fb5ef905760 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 9 Jun 2011 13:06:26 +0300 Subject: [PATCH] MonadPlus (Jeremy Hughes) --- Yesod/Handler.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Yesod/Handler.hs b/Yesod/Handler.hs index fb13dc11..53125669 100644 --- a/Yesod/Handler.hs +++ b/Yesod/Handler.hs @@ -120,7 +120,7 @@ import Control.Exception hiding (Handler, catch, finally) import qualified Control.Exception as E import Control.Applicative -import Control.Monad (liftM, join) +import Control.Monad (liftM, join, MonadPlus) import Control.Monad.IO.Class import Control.Monad.Trans.Class @@ -246,7 +246,7 @@ newtype GGHandler sub master m a = GHandler { unGHandler :: GHInner sub master m a } - deriving (Functor, Applicative, Monad, MonadIO, MonadControlIO) + deriving (Functor, Applicative, Monad, MonadIO, MonadControlIO, MonadPlus) instance MonadTrans (GGHandler s m) where lift = GHandler . lift . lift . lift . lift