unliftio-core 0.2

yesod-core/ChangeLog.md

@@ -1,5 +1,9 @@
 # ChangeLog for yesod-core
 
+## 1.6.17.3
+
+* Support for `unliftio-core` 0.2
+
 ## 1.6.17.2
 
 * Support template-haskell 2.16, build with GHC 8.10 [#1657](https://github.com/yesodweb/yesod/pull/1657)

yesod-core/src/Yesod/Core/Types.hs

@@ -55,7 +55,7 @@ import           Control.Monad.Reader               (MonadReader (..))
 import Control.DeepSeq (NFData (rnf))
 import Yesod.Core.TypeCache (TypeMap, KeyedTypeMap)
 import Control.Monad.Logger (MonadLoggerIO (..))
-import UnliftIO (MonadUnliftIO (..), UnliftIO (..))
+import UnliftIO (MonadUnliftIO (..))
 
 -- Sessions
 type SessionMap = Map Text ByteString
@@ -437,9 +437,8 @@ instance PrimMonad (WidgetFor site) where
     primitive = liftIO . primitive
 -- | @since 1.4.38
 instance MonadUnliftIO (WidgetFor site) where
-  {-# INLINE askUnliftIO #-}
+  {-# INLINE withRunInIO #-}
-  askUnliftIO = WidgetFor $ \wd ->
+  withRunInIO inner = WidgetFor $ \x -> inner $ flip unWidgetFor x
-                return (UnliftIO (flip unWidgetFor wd))
 instance MonadReader (WidgetData site) (WidgetFor site) where
     ask = WidgetFor return
     local f (WidgetFor g) = WidgetFor $ g . f
@@ -476,9 +475,8 @@ instance MonadReader (HandlerData site site) (HandlerFor site) where
 
 -- | @since 1.4.38
 instance MonadUnliftIO (HandlerFor site) where
-  {-# INLINE askUnliftIO #-}
+  {-# INLINE withRunInIO #-}
-  askUnliftIO = HandlerFor $ \r ->
+  withRunInIO inner = HandlerFor $ \x -> inner $ flip unHandlerFor x
-                return (UnliftIO (flip unHandlerFor r))
 
 instance MonadThrow (HandlerFor site) where
     throwM = liftIO . throwM
@@ -549,9 +547,8 @@ instance MonadReader (HandlerData child master) (SubHandlerFor child master) whe
 
 -- | @since 1.4.38
 instance MonadUnliftIO (SubHandlerFor child master) where
-  {-# INLINE askUnliftIO #-}
+  {-# INLINE withRunInIO #-}
-  askUnliftIO = SubHandlerFor $ \r ->
+  withRunInIO inner = SubHandlerFor $ \x -> inner $ flip unSubHandlerFor x
-                return (UnliftIO (flip unSubHandlerFor r))
 
 instance MonadThrow (SubHandlerFor child master) where
     throwM = liftIO . throwM

yesod-core/yesod-core.cabal

@@ -1,5 +1,5 @@
 name:            yesod-core
-version:         1.6.17.2
+version:         1.6.17.3
 license:         MIT
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>