From: ShihCheng Tu <mrtoastcheng@gmail.com>
Date: Sun, 14 Jun 2020 16:07:10 +0000 (+0800)
Subject: [release-branch.go1.14] doc/go1.14: document json.Umarshal map key support of TextUnm... 
X-Git-Tag: go1.14.9~5
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=404635c2eb3ab9ac07a013d9508f88ceb8d533c4;p=gostls13.git

[release-branch.go1.14] doc/go1.14: document json.Umarshal map key support of TextUnmarshaler

Document that json.Unmarshal supports map keys whose underlying
types implement encoding.TextUnmarshaler.

Updates #38801.
Fixes #38904.

Change-Id: Icb9414e9067517531ba0da910bd4a2bb3daace65
Reviewed-on: https://go-review.googlesource.com/c/go/+/237857
Reviewed-by: Daniel Martí <mvdan@mvdan.cc>
Run-TryBot: Daniel Martí <mvdan@mvdan.cc>
TryBot-Result: Gobot Gobot <gobot@golang.org>
(cherry picked from commit 47b450997778163dfed6f58cae379d928fc37687)
Reviewed-on: https://go-review.googlesource.com/c/go/+/252617
Run-TryBot: Dmitri Shuralyov <dmitshur@golang.org>
Reviewed-by: Carlos Amedee <carlos@golang.org>
---

diff --git a/doc/go1.14.html b/doc/go1.14.html
index 35a9f3c2f3..410e0cbf7c 100644
--- a/doc/go1.14.html
+++ b/doc/go1.14.html
@@ -609,6 +609,12 @@ Do not send CLs removing the interior tags from such phrases.
       If a program needs to accept invalid numbers like the empty string,
       consider wrapping the type with <a href="/pkg/encoding/json/#Unmarshaler"><code>Unmarshaler</code></a>.
     </p>
+
+    <p><!-- CL 200237 -->
+      <a href="/pkg/encoding/json/#Unmarshal"><code>Unmarshal</code></a>
+      can now support map keys with string underlying type which implement
+      <a href="/pkg/encoding/#TextUnmarshaler"><code>encoding.TextUnmarshaler</code></a>.
+    </p>
   </dd>
 </dl><!-- encoding/json -->