From 4e171a7a1a179641cfba2ebb6ad29ab7068f490e Mon Sep 17 00:00:00 2001
From: Steffen <s.jost@fraport.de>
Date: Tue, 8 Oct 2024 10:08:04 +0200
Subject: [PATCH] fix(memcached): using memcachedHere did not compile due to
 staging problems

---
 src/Handler/Utils/Memcached.hs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/Handler/Utils/Memcached.hs b/src/Handler/Utils/Memcached.hs
index 140dcebc9..3aafd4b19 100644
--- a/src/Handler/Utils/Memcached.hs
+++ b/src/Handler/Utils/Memcached.hs
@@ -377,10 +377,17 @@ newtype MemcachedUnkeyedLoc a = MemcachedUnkeyedLoc { unMemcachedUnkeyedLoc :: a
 instance NFData a => NFData (MemcachedUnkeyedLoc a) where
   rnf MemcachedUnkeyedLoc{..} = rnf unMemcachedUnkeyedLoc
 
+-- avoids staging restictions
+withMemcachedUnkeyedLoc :: Functor f => (f (MemcachedUnkeyedLoc a) -> f (MemcachedUnkeyedLoc a)) -> (f a -> f a)
+withMemcachedUnkeyedLoc act = fmap unMemcachedUnkeyedLoc . act . fmap MemcachedUnkeyedLoc
+{-# INLINE withMemcachedUnkeyedLoc #-}
+
+-- Evaluates to: $(memcachedHere) :: forall a m. ( MonadHandler m, HandlerSite m ~ UniWorX, MonadThrow m, Typeable a, Binary a)
+--                                   => Maybe Expiry -> m a -> m a
 memcachedHere :: Q Exp
 memcachedHere = do
   loc <- location
-  [e| \mExp -> fmap unMemcachedUnkeyedLoc . memcachedBy mExp loc . fmap MemcachedUnkeyedLoc |]
+  [e| \mExp -> withMemcachedUnkeyedLoc (memcachedBy mExp loc) |]
 
 newtype MemcachedKeyedLoc a = MemcachedKeyedLoc { unMemcachedKeyedLoc :: a }
   deriving newtype (Eq, Ord, Show, Binary)
@@ -395,6 +402,8 @@ withMemcachedKeyedLoc' :: (Functor f, Functor f') => (f (MemcachedKeyedLoc a) ->
 withMemcachedKeyedLoc' act = fmap (fmap unMemcachedKeyedLoc) . act . fmap MemcachedKeyedLoc
 {-# INLINE withMemcachedKeyedLoc' #-}
 
+-- Evaluates to: $(memcachedByHere) :: forall a m k. ( MonadHandler m, HandlerSite m ~ UniWorX, MonadThrow m, Typeable a, Binary a, Binary k)
+--                                   => Maybe Expiry -> k -> m a -> m a
 memcachedByHere :: Q Exp
 memcachedByHere = do
   loc <- location