From: GuilhermeCaruso <gui.martinscaruso@gmail.com>
Date: Tue, 15 Jan 2019 23:24:52 +0000 (+0000)
Subject: encoding/json: add comment for mashalererror struct
X-Git-Tag: go1.12rc1~71
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=5fae09b7386de26db59a1184f62fc7b22ec7667b;p=gostls13.git

encoding/json: add comment for mashalererror struct

Change-Id: Iaabbfe5a4c1bbedd19d4087f1b79e5a38bdd3878
GitHub-Last-Rev: 55c91fc19074dacc66623aa7ff2286b11ccd5340
GitHub-Pull-Request: golang/go#29752
Reviewed-on: https://go-review.googlesource.com/c/157958
Reviewed-by: Ian Lance Taylor <iant@golang.org>
---

diff --git a/src/encoding/json/encode.go b/src/encoding/json/encode.go
index f10124e67d..dea63f1850 100644
--- a/src/encoding/json/encode.go
+++ b/src/encoding/json/encode.go
@@ -259,6 +259,7 @@ func (e *InvalidUTF8Error) Error() string {
 	return "json: invalid UTF-8 in string: " + strconv.Quote(e.S)
 }
 
+// A MarshalerError represents an error from calling a MarshalJSON or MarshalText method.
 type MarshalerError struct {
 	Type reflect.Type
 	Err  error