diff options
| author | Rob Findley <rfindley@google.com> | 2020-09-11 14:23:34 -0400 |
|---|---|---|
| committer | Rob Findley <rfindley@google.com> | 2020-09-11 14:23:34 -0400 |
| commit | f8b1c17aced24a1618c6984794be9770c5d260be (patch) | |
| tree | 45af8d39b5c3d9f43d439ebec0a2ba42b49efe70 /doc/go1.14.html | |
| parent | e5d91ab096a9ff9673311f1a7f3f860a7f9c2062 (diff) | |
| parent | 07c1788357cfe6a4ee5f6f6a54d4fe9f579fa844 (diff) | |
| download | go-f8b1c17aced24a1618c6984794be9770c5d260be.tar.gz go-f8b1c17aced24a1618c6984794be9770c5d260be.zip | |
[dev.types] all: merge master into dev.typesdev.types
Change-Id: Ia6964cb4e09153c15cc9c5b441373d1b3cb8f757
Diffstat (limited to 'doc/go1.14.html')
| -rw-r--r-- | doc/go1.14.html | 6 |
1 files changed, 6 insertions, 0 deletions
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 --> |