yesod-core 1.6.17.1 → 1.6.17.2
raw patch · 3 files changed
+22/−4 lines, 3 files
Files
- ChangeLog.md +4/−0
- src/Yesod/Routes/TH/RenderRoute.hs +17/−3
- yesod-core.cabal +1/−1
ChangeLog.md view
@@ -1,5 +1,9 @@ # ChangeLog for yesod-core +## 1.6.17.2++* Support template-haskell 2.16, build with GHC 8.10 [#1657](https://github.com/yesodweb/yesod/pull/1657)+ ## 1.6.17.1 * Remove unnecessary deriving of Typeable
src/Yesod/Routes/TH/RenderRoute.hs view
@@ -84,7 +84,12 @@ let cons y ys = InfixE (Just y) colon (Just ys) let pieces' = foldr cons (VarE a) piecesSingle - let body = LamE [TupP [VarP a, VarP b]] (TupE [pieces', VarE b]) `AppE` (rr `AppE` VarE child)+ let body = LamE [TupP [VarP a, VarP b]] (TupE+#if MIN_VERSION_template_haskell(2,16,0)+ $ map Just+#endif+ [pieces', VarE b]+ ) `AppE` (rr `AppE` VarE child) return $ Clause [pat] (NormalB body) [FunD childRender childClauses] @@ -119,11 +124,20 @@ let cons y ys = InfixE (Just y) colon (Just ys) let pieces = foldr cons (VarE a) piecesSingle - return $ LamE [TupP [VarP a, VarP b]] (TupE [pieces, VarE b]) `AppE` (rr `AppE` VarE x)+ return $ LamE [TupP [VarP a, VarP b]] (TupE+#if MIN_VERSION_template_haskell(2,16,0)+ $ map Just+#endif+ [pieces, VarE b]+ ) `AppE` (rr `AppE` VarE x) _ -> do colon <- [|(:)|] let cons a b = InfixE (Just a) colon (Just b)- return $ TupE [foldr cons piecesMulti piecesSingle, ListE []]+ return $ TupE+#if MIN_VERSION_template_haskell(2,16,0)+ $ map Just+#endif+ [foldr cons piecesMulti piecesSingle, ListE []] return $ Clause [pat] (NormalB body) []
yesod-core.cabal view
@@ -1,5 +1,5 @@ name: yesod-core-version: 1.6.17.1+version: 1.6.17.2 license: MIT license-file: LICENSE author: Michael Snoyman <michael@snoyman.com>