From 22ff14aa190323cba778f10aeefcaa582de20df1 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Tue, 16 Mar 2021 15:10:59 -0700 Subject: [PATCH 1/2] followup #17389; add see also in std/json --- changelog.md | 3 +++ lib/pure/json.nim | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/changelog.md b/changelog.md index f85331c91a88..4b5620134351 100644 --- a/changelog.md +++ b/changelog.md @@ -39,6 +39,9 @@ - added `jsonutils.jsonTo` overload with `opt = Joptions()` param. +- `json.%`,`json.to`, `jsonutils.formJson`,`jsonutils.toJson` now works with `uint|uint64` + instead of raising (as in 1.4) or giving wrong results (as in 1.2). + - Added an overload for the `collect` macro that inferes the container type based on the syntax of the last expression. Works with std seqs, tables and sets. diff --git a/lib/pure/json.nim b/lib/pure/json.nim index 5feb81457207..13cd3fb854c1 100644 --- a/lib/pure/json.nim +++ b/lib/pure/json.nim @@ -14,6 +14,14 @@ ## JSON is based on a subset of the JavaScript Programming Language, ## Standard ECMA-262 3rd Edition - December 1999. ## +## See also +## ======== +## * `std/parsejson `_ +## * `std/jsonutils `_ +## * `std/marshal `_ +## * `std/jscore `_ +## +## ## Overview ## ======== ## From 5043be3e53cbccd530dbba2388cae2287b462e4c Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Tue, 16 Mar 2021 18:12:28 -0700 Subject: [PATCH 2/2] Update changelog.md Co-authored-by: flywind --- changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index 4b5620134351..c6ba157d0682 100644 --- a/changelog.md +++ b/changelog.md @@ -39,7 +39,7 @@ - added `jsonutils.jsonTo` overload with `opt = Joptions()` param. -- `json.%`,`json.to`, `jsonutils.formJson`,`jsonutils.toJson` now works with `uint|uint64` +- `json.%`,`json.to`, `jsonutils.formJson`,`jsonutils.toJson` now work with `uint|uint64` instead of raising (as in 1.4) or giving wrong results (as in 1.2). - Added an overload for the `collect` macro that inferes the container type based