haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1329 from ocharles/master

Browse Source 
yesod-core: Build with template-haskell-2.12.0
This commit is contained in:
Michael Snoyman 2017-01-04 16:18:13 +02:00 committed by GitHub
commit 42e0e9aab9
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
yesod-core/Yesod/Routes/TH/RenderRoute.hs
View File

@ -46,7 +46,9 @@ mkRouteCons rttypes =
mkRouteCon (ResourceParent name _check pieces children) = do mkRouteCon (ResourceParent name _check pieces children) = do
(cons, decs) <- mkRouteCons children (cons, decs) <- mkRouteCons children
#if MIN_VERSION_template_haskell(2,11,0) #if MIN_VERSION_template_haskell(2,12,0)
dec <- DataD [] (mkName name) [] Nothing cons <$> fmap (pure . DerivClause Nothing) (mapM conT [''Show, ''Read, ''Eq])
#elif MIN_VERSION_template_haskell(2,11,0)
dec <- DataD [] (mkName name) [] Nothing cons <$> mapM conT [''Show, ''Read, ''Eq] dec <- DataD [] (mkName name) [] Nothing cons <$> mapM conT [''Show, ''Read, ''Eq]
#else #else
let dec = DataD [] (mkName name) [] cons [''Show, ''Read, ''Eq] let dec = DataD [] (mkName name) [] cons [''Show, ''Read, ''Eq]
@ -153,7 +155,9 @@ mkRenderRouteInstance' :: Cxt -> Type -> [ResourceTree Type] -> Q [Dec]
mkRenderRouteInstance' cxt typ ress = do mkRenderRouteInstance' cxt typ ress = do
cls <- mkRenderRouteClauses ress cls <- mkRenderRouteClauses ress
(cons, decs) <- mkRouteCons ress (cons, decs) <- mkRouteCons ress
#if MIN_VERSION_template_haskell(2,11,0) #if MIN_VERSION_template_haskell(2,12,0)
did <- DataInstD [] ''Route [typ] Nothing cons <$> fmap (pure . DerivClause Nothing) (mapM conT clazzes)
#elif MIN_VERSION_template_haskell(2,11,0)
did <- DataInstD [] ''Route [typ] Nothing cons <$> mapM conT clazzes did <- DataInstD [] ''Route [typ] Nothing cons <$> mapM conT clazzes
#else #else
let did = DataInstD [] ''Route [typ] cons clazzes let did = DataInstD [] ''Route [typ] cons clazzes