Skip to content

Commit

Permalink
Merge pull request elm#2 from simonh1000/patch-3
Browse files Browse the repository at this point in the history
Patch 3
  • Loading branch information
simonh1000 committed Dec 7, 2015
2 parents 0149a67 + 8353c13 commit d49d8d1
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/Json/Decode.elm
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ object8 =
Native.Json.decodeObject8


{-| Turn any object into a list of key-value pairs. Fails if _any_ key can't be
{-| Turn any object into a list of key-value pairs, including inherited enumerable properies. Fails if _any_ value can't be
decoded with the given decoder.
-- { tom: 89, sue: 92, bill: 97, ... }
Expand All @@ -220,7 +220,8 @@ keyValuePairs =
Native.Json.decodeKeyValuePairs


{-| Turn any object into a dictionary of key-value pairs.
{-| Turn any object into a dictionary of key-value pairs, including inherited enumerable properies. Fails if _any_ value can't be
decoded with the given decoder.
-- { mercury: 0.33, venus: 4.87, earth: 5.97, ... }
planetMasses : Decoder (Dict String Float)
Expand Down

0 comments on commit d49d8d1

Please sign in to comment.