From c35bdb1cd441e6042b0d7fda2ad13e6b4c3831cf Mon Sep 17 00:00:00 2001 From: Teo Camarasu Date: Fri, 10 Feb 2023 12:13:01 +0000 Subject: [PATCH] Adapt to removal of ListT from transformers-0.6.0 Co-authored-by: Ryan Scott --- yesod-core/ChangeLog.md | 4 ++++ yesod-core/src/Yesod/Core/Class/Handler.hs | 6 ++++++ yesod-core/yesod-core.cabal | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/yesod-core/ChangeLog.md b/yesod-core/ChangeLog.md index ae2c2295..988dd27e 100644 --- a/yesod-core/ChangeLog.md +++ b/yesod-core/ChangeLog.md @@ -1,5 +1,9 @@ # ChangeLog for yesod-core +## 1.6.24.1 + +* Adapt to removal of `ListT` from transformers-0.6. [#1796](https://github.com/yesodweb/yesod/pull/1796) + ## 1.6.24.0 * Make catching exceptions configurable and set the default back to rethrowing async exceptions. [#1772](https://github.com/yesodweb/yesod/pull/1772). diff --git a/yesod-core/src/Yesod/Core/Class/Handler.hs b/yesod-core/src/Yesod/Core/Class/Handler.hs index 8d8ca448..d166a129 100644 --- a/yesod-core/src/Yesod/Core/Class/Handler.hs +++ b/yesod-core/src/Yesod/Core/Class/Handler.hs @@ -19,7 +19,9 @@ import Control.Monad.Trans.Class (lift) import Data.Conduit.Internal (Pipe, ConduitM) import Control.Monad.Trans.Identity ( IdentityT) +#if !MIN_VERSION_transformers(0,6,0) import Control.Monad.Trans.List ( ListT ) +#endif import Control.Monad.Trans.Maybe ( MaybeT ) import Control.Monad.Trans.Except ( ExceptT ) import Control.Monad.Trans.Reader ( ReaderT ) @@ -76,7 +78,9 @@ instance MonadHandler (WidgetFor site) where #define GO(T) instance MonadHandler m => MonadHandler (T m) where type HandlerSite (T m) = HandlerSite m; type SubHandlerSite (T m) = SubHandlerSite m; liftHandler = lift . liftHandler; liftSubHandler = lift . liftSubHandler #define GOX(X, T) instance (X, MonadHandler m) => MonadHandler (T m) where type HandlerSite (T m) = HandlerSite m; type SubHandlerSite (T m) = SubHandlerSite m; liftHandler = lift . liftHandler; liftSubHandler = lift . liftSubHandler GO(IdentityT) +#if !MIN_VERSION_transformers(0,6,0) GO(ListT) +#endif GO(MaybeT) GO(ExceptT e) GO(ReaderT r) @@ -104,7 +108,9 @@ liftWidgetT = liftWidget #define GO(T) instance MonadWidget m => MonadWidget (T m) where liftWidget = lift . liftWidget #define GOX(X, T) instance (X, MonadWidget m) => MonadWidget (T m) where liftWidget = lift . liftWidget GO(IdentityT) +#if !MIN_VERSION_transformers(0,6,0) GO(ListT) +#endif GO(MaybeT) GO(ExceptT e) GO(ReaderT r) diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal index 457f4b6d..9910bea2 100644 --- a/yesod-core/yesod-core.cabal +++ b/yesod-core/yesod-core.cabal @@ -1,5 +1,5 @@ name: yesod-core -version: 1.6.24.0 +version: 1.6.24.1 license: MIT license-file: LICENSE author: Michael Snoyman