Replacing use of Object mempty to avoid ambiguous Object export
commit47fe2cdb9a60973a0c5d8b9bfd789a31bcc7820b
authorBrendan Hay <brendan.g.hay@gmail.com>
dateMon 5 Oct 2015, 11:11 (11 years ago)
parent21b1d8f
core/src/Network/Google/Data/JSON.hs+4−1
@@ -16,8 +16,8 @@ module Network.Google.Data.JSON
1616 , FromJSON (..)
1717 , ToJSON (..)
1818
19− , Value (Object)
2019 , withObject
20+ , emptyObject
2121 , object
2222
2323 , (.=)
@@ -33,6 +33,9 @@ import Servant.API
3333
3434type JSONValue = Value
3535
36+emptyObject :: Value
37+emptyObject = Object mempty
38+
3639parseJSONText :: FromText a => String -> Value -> Parser a
3740parseJSONText n = withText n (maybe (fail n) pure . fromText)
3841
gen/src/Gen/Syntax.hs+1−1
@@ -273,7 +273,7 @@ jsonDecls g p (Map.toList -> rs) = [from, to]
273273 . app (var "catMaybes")
274274 . listE
275275
276− none = paren $ app (var "Object") (var "mempty")
276+ none = var "emptyObject"
277277
278278 encode (l, s)
279279 | TMaybe {} <- _type s = infixApp (paren (app n o)) "<$>" a