From: Brad Fitzpatrick <bradfitz@golang.org>
Date: Wed, 13 Jun 2012 20:24:13 +0000 (-0400)
Subject: [release-branch.go1] encoding/json: documentation fix
X-Git-Tag: go1.0.2~62
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=7de2fc41a2941cd2d16cbc5e4320750731bbf835;p=gostls13.git

[release-branch.go1] encoding/json: documentation fix

««« backport 258d7ab64d9a
encoding/json: documentation fix

Fixes #3650

R=golang-dev, adg
CC=golang-dev
https://golang.org/cl/6238046

»»»
---

diff --git a/src/pkg/encoding/json/encode.go b/src/pkg/encoding/json/encode.go
index 842672c397..b6e1cb16e5 100644
--- a/src/pkg/encoding/json/encode.go
+++ b/src/pkg/encoding/json/encode.go
@@ -96,7 +96,7 @@ import (
 //
 // Channel, complex, and function values cannot be encoded in JSON.
 // Attempting to encode such a value causes Marshal to return
-// an InvalidTypeError.
+// an UnsupportedTypeError.
 //
 // JSON cannot represent cyclic data structures and Marshal does not
 // handle them.  Passing cyclic structures to Marshal will result in
@@ -157,6 +157,8 @@ type Marshaler interface {
 	MarshalJSON() ([]byte, error)
 }
 
+// An UnsupportedTypeError is returned by Marshal when attempting
+// to encode an unsupported value type.
 type UnsupportedTypeError struct {
 	Type reflect.Type
 }