From 0e076d5198aceef71d4e1046a3ae082079a4d894 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 17 Jan 2012 14:08:30 +0200 Subject: [PATCH] Fixed GWidget Functor instance --- yesod-core/Yesod/Widget.hs | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/yesod-core/Yesod/Widget.hs b/yesod-core/Yesod/Widget.hs index 54bfcd7e..4291218d 100644 --- a/yesod-core/Yesod/Widget.hs +++ b/yesod-core/Yesod/Widget.hs @@ -311,12 +311,6 @@ ihamletToRepHtml ih = do tell :: GWData (Route master) -> GWidget sub master () tell w = GWidget $ return ((), w) -mapWriterT :: (GHandler sub master (a, GWData (Route master)) - -> GHandler sub' master' (b, GWData (Route master'))) - -> GWidget sub master a - -> GWidget sub' master' b -mapWriterT = undefined - instance MonadLift (GHandler sub master) (GWidget sub master) where lift = GWidget . fmap (\x -> (x, mempty)) @@ -326,7 +320,7 @@ liftW = lift -- Instances for GWidget instance Functor (GWidget sub master) where - fmap f = mapWriterT $ fmap $ \ (a, w) -> (f a, w) + fmap f (GWidget x) = GWidget (fmap (\(a, w) -> (f a, w)) x) instance Applicative (GWidget sub master) where pure a = GWidget $ pure (a, mempty) GWidget f <*> GWidget v =