on master help sign in
Merge pull request #423 from phadej/error-in-map

Tell which key failed to parse in maps

commit6a983c67273c9cabda6c6f080893759d82d6bcec authorAdam Bergmark <adam@bergmark.nl> dateMon 13 Jun 2016, 18:01 (10 years ago) parent737ed5c6c60aff
1 file changed+2−2
Data/Aeson/Types/FromJSON.hs+2−2
Data/Aeson/Types/FromJSON.hs+2−2
@@ -1300,7 +1300,7 @@ instance (FromJSONKey k, Ord k) => FromJSON1 (M.Map k) where
13001300 FromJSONKeyText f -> withObject "Map k v" $
13011301 fmap (H.foldrWithKey (M.insert . f) M.empty) . H.traverseWithKey (\k v -> p v <?> Key k)
13021302 FromJSONKeyTextParser f -> withObject "Map k v" $
1303− H.foldrWithKey (\k v m -> M.insert <$> f k <*> (p v <?> Key k) <*> m) (pure M.empty)
1303+ H.foldrWithKey (\k v m -> M.insert <$> f k <?> Key k <*> p v <?> Key k <*> m) (pure M.empty)
13041304 FromJSONKeyValue f -> withArray "Map k v" $ \arr ->
13051305 M.fromList <$> (Tr.sequence .
13061306 zipWith (parseIndexedJSONPair f p) [0..] . V.toList $ arr)
@@ -1368,7 +1368,7 @@ instance (FromJSONKey k, Eq k, Hashable k) => FromJSON1 (H.HashMap k) where
13681368 FromJSONKeyText f -> withObject "HashMap k v" $
13691369 fmap (mapKey f) . H.traverseWithKey (\k v -> p v <?> Key k)
13701370 FromJSONKeyTextParser f -> withObject "HashMap k v" $
1371− H.foldrWithKey (\k v m -> H.insert <$> f k <*> (p v <?> Key k) <*> m) (pure H.empty)
1371+ H.foldrWithKey (\k v m -> H.insert <$> f k <?> Key k <*> p v <?> Key k <*> m) (pure H.empty)
13721372 FromJSONKeyValue f -> withArray "Map k v" $ \arr ->
13731373 H.fromList <$> (Tr.sequence .
13741374 zipWith (parseIndexedJSONPair f p) [0..] . V.toList $ arr)