From 2f17cda10dfa0ba355488bb59a798b3661258889 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 30 Jun 2010 12:44:57 +0300 Subject: [PATCH] Routes is data family, not type family --- Yesod/Dispatch.hs | 4 ++-- Yesod/Handler.hs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Yesod/Dispatch.hs b/Yesod/Dispatch.hs index 3ac56f2f..51ccbefb 100644 --- a/Yesod/Dispatch.hs +++ b/Yesod/Dispatch.hs @@ -146,8 +146,8 @@ mkYesodGeneral name args clazzes isSub res = do explode <- [|explodeHandler|] let th = map thResourceFromResource res w' <- createRoutes th - let w = DataD [] (mkName $ name ++ "Routes") [] w' [] - let x = TySynInstD ''Routes [arg] $ ConT $ mkName $ name ++ "Routes" + let w = DataInstD [] ''Routes [arg] w' [] + let x = TySynD (mkName $ name ++ "Routes") [] $ ConT ''Routes `AppT` arg parse' <- createParse th parse'' <- newName "parse" diff --git a/Yesod/Handler.hs b/Yesod/Handler.hs index 1b47d79a..e15966bb 100644 --- a/Yesod/Handler.hs +++ b/Yesod/Handler.hs @@ -93,7 +93,7 @@ import Text.Hamlet import Numeric (showIntAtBase) import Data.Char (ord, chr) -type family Routes a +data family Routes a data HandlerData sub master = HandlerData { handlerRequest :: Request