From: Eli Bendersky <eliben@google.com>
Date: Fri, 2 Aug 2019 21:13:23 +0000 (-0700)
Subject: encoding/json: clarify Unmarshal behavior for map keys
X-Git-Tag: go1.14beta1~1162
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=28f8f55bd29f997fc814782f161ae09520955a8d;p=gostls13.git

encoding/json: clarify Unmarshal behavior for map keys

This is a documentation-only change

Fixes #33298

Change-Id: I816058a872b57dc868dff11887214d9de92d9342
Reviewed-on: https://go-review.googlesource.com/c/go/+/188821
Reviewed-by: Daniel Martí <mvdan@mvdan.cc>
Run-TryBot: Daniel Martí <mvdan@mvdan.cc>
TryBot-Result: Gobot Gobot <gobot@golang.org>
---

diff --git a/src/encoding/json/decode.go b/src/encoding/json/decode.go
index df1c085917..2b135f0da5 100644
--- a/src/encoding/json/decode.go
+++ b/src/encoding/json/decode.go
@@ -72,7 +72,8 @@ import (
 // use. If the map is nil, Unmarshal allocates a new map. Otherwise Unmarshal
 // reuses the existing map, keeping existing entries. Unmarshal then stores
 // key-value pairs from the JSON object into the map. The map's key type must
-// either be a string, an integer, or implement encoding.TextUnmarshaler.
+// either be any string type, an integer, implement json.Unmarshaler, or
+// implement encoding.TextUnmarshaler.
 //
 // If a JSON value is not appropriate for a given target type,
 // or if a JSON number overflows the target type, Unmarshal