From: Joe Tsai Date: Wed, 11 Oct 2017 21:41:25 +0000 (-0700) Subject: encoding/json: use Deprecated markers X-Git-Tag: go1.10beta1~758 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=a3e013b0824ba53168b5d91abdb6ce191510a89d;p=gostls13.git encoding/json: use Deprecated markers In #10909, it was decided that "Deprecated:" is a magic string for tools (e.g., #17056 for godoc) to detect deprecated identifiers. Use those convention instead of custom written prose. Change-Id: Ia514fc3c88fc502e86c6e3de361c435f4cb80b22 Reviewed-on: https://go-review.googlesource.com/70110 Reviewed-by: Ian Lance Taylor Run-TryBot: Joe Tsai --- diff --git a/src/encoding/json/decode.go b/src/encoding/json/decode.go index bc3bd9733d..44f9035358 100644 --- a/src/encoding/json/decode.go +++ b/src/encoding/json/decode.go @@ -138,7 +138,8 @@ func (e *UnmarshalTypeError) Error() string { // An UnmarshalFieldError describes a JSON object key that // led to an unexported (and therefore unwritable) struct field. -// (No longer used; kept for compatibility.) +// +// Deprecated: No longer used; kept for compatibility. type UnmarshalFieldError struct { Key string Type reflect.Type diff --git a/src/encoding/json/encode.go b/src/encoding/json/encode.go index d1dda9796a..3f7a8d0175 100644 --- a/src/encoding/json/encode.go +++ b/src/encoding/json/encode.go @@ -245,8 +245,8 @@ func (e *UnsupportedValueError) Error() string { // attempting to encode a string value with invalid UTF-8 sequences. // As of Go 1.2, Marshal instead coerces the string to valid UTF-8 by // replacing invalid bytes with the Unicode replacement rune U+FFFD. -// This error is no longer generated but is kept for backwards compatibility -// with programs that might mention it. +// +// Deprecated: No longer used; kept for compatibility. type InvalidUTF8Error struct { S string // the whole string value that caused the error }