Skip to content

template-haskell 2.17 compatibility #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kfigiela wants to merge 2 commits into
base: master
Choose a base branch
from
Open

template-haskell 2.17 compatibility #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81efc7b
Update Restful.hs
kfigiela Feb 6, 2023
ef8c74f
Update TH.hs
kfigiela Feb 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Snap/Restful.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,7 @@ instance HasFormlet Word64 where

validDate :: Text -> Result Text Day
validDate = maybe (Error "invalid date") Success .
parseTime LC.defaultTimeLocale "%F" . T.unpack
parseTimeM True LC.defaultTimeLocale "%F" . T.unpack


dayText :: Day -> Text
Expand Down
4 changes: 2 additions & 2 deletions src/Snap/Restful/TH.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ iSplices n = do
-- return $ TupE [LitE $ StringL $ nameBase fn, f]
return $ NoBindS $ UInfixE (LitE $ StringL $ nameBase fn) (VarE $ mkName "##") f
fs <- mapM fieldToSplice fields
return $ LamE [VarP param] (DoE fs)
return $ LamE [VarP param] (DoE Nothing fs)
_ -> error "You can only generate splices for a data type with a single constructor and named record fields"


Expand All @@ -120,7 +120,7 @@ cSplices n = do
-- return $ TupE [LitE $ StringL $ nameBase fn, f]
return $ NoBindS $ UInfixE (LitE $ StringL $ nameBase fn) (VarE $ mkName "##") f
fs <- mapM fieldToSplice fields
return $ DoE fs
return $ DoE Nothing fs
_ -> error "You can only generate splices for a data type with a single constructor and named record fields"


Expand Down