qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-26 03:07:57 -07:00
Code Releases Activity

encoding/json: clarify the map's key type for Unmarshal

Browse Source 
While here, also fix doc link for encoding.TextMarshaler.

Fixes #67495

Change-Id: Ia2a674c5c35b5a849ce8f5eef3d34d165b3195b6
Reviewed-on: https://go-review.googlesource.com/c/go/+/593335
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Joseph Tsai <joetsai@digital-static.net>
Reviewed-by: David Chase <drchase@google.com>
Auto-Submit: Ian Lance Taylor <iant@google.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
This commit is contained in:
Jes Cok 2024-06-18 23:43:21 +08:00 committed by Gopher Robot
parent e9a306e004
commit 72e2220b50
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/encoding/json/decode.go
View File

@ -73,8 +73,7 @@ import (
// use. If the map is nil, Unmarshal allocates a new map. Otherwise Unmarshal // use. If the map is nil, Unmarshal allocates a new map. Otherwise Unmarshal
// reuses the existing map, keeping existing entries. Unmarshal then stores // 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 // key-value pairs from the JSON object into the map. The map's key type must
// either be any string type, an integer, implement [json.Unmarshaler], or // either be any string type, an integer, or implement [encoding.TextUnmarshaler].
// implement [encoding.TextUnmarshaler].
// //
// If the JSON-encoded data contain a syntax error, Unmarshal returns a [SyntaxError]. // If the JSON-encoded data contain a syntax error, Unmarshal returns a [SyntaxError].
// //

2
src/encoding/json/encode.go
View File

@ -141,7 +141,7 @@ import (
// are sorted and used as JSON object keys by applying the following rules, // are sorted and used as JSON object keys by applying the following rules,
// subject to the UTF-8 coercion described for string values above: // subject to the UTF-8 coercion described for string values above:
// - keys of any string type are used directly // - keys of any string type are used directly
// - [encoding.TextMarshalers] are marshaled // - keys that implement [encoding.TextMarshaler] are marshaled
// - integer keys are converted to strings // - integer keys are converted to strings
// //
// Pointer values encode as the value pointed to. // Pointer values encode as the value pointed to.