aboutsummaryrefslogtreecommitdiff
path: root/api/go1.5.txt
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@golang.org>2015-07-30 11:27:51 +0200
committerBrad Fitzpatrick <bradfitz@golang.org>2015-07-30 21:14:09 +0000
commit0e00b447a5a7aa4a52a76a6b33d894a5541b58dd (patch)
tree5cb0b9113b3a57e44fa9e109d3302de07c4a93a8 /api/go1.5.txt
parentca6f7e45cbe33a1952a47d0846b1a9096bda5db7 (diff)
downloadgo-0e00b447a5a7aa4a52a76a6b33d894a5541b58dd.tar.gz
go-0e00b447a5a7aa4a52a76a6b33d894a5541b58dd.zip
api: update go1.5.txt
Fixes #11935 Change-Id: Ife00c246345f7d3f96aa95349a35e76671ca7160 Reviewed-on: https://go-review.googlesource.com/12769 Reviewed-by: Dave Cheney <dave@cheney.net> Reviewed-by: Russ Cox <rsc@golang.org>
Diffstat (limited to 'api/go1.5.txt')
-rw-r--r--api/go1.5.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/api/go1.5.txt b/api/go1.5.txt
index 72e4ad9ae7..d9cf797075 100644
--- a/api/go1.5.txt
+++ b/api/go1.5.txt
@@ -278,6 +278,11 @@ pkg encoding/base64, const StdPadding int32
pkg encoding/base64, method (Encoding) WithPadding(int32) *Encoding
pkg encoding/base64, var RawStdEncoding *Encoding
pkg encoding/base64, var RawURLEncoding *Encoding
+pkg encoding/json, method (*Decoder) More() bool
+pkg encoding/json, method (*Decoder) Token() (Token, error)
+pkg encoding/json, method (Delim) String() string
+pkg encoding/json, type Delim int32
+pkg encoding/json, type Token interface {}
pkg encoding/json, type UnmarshalTypeError struct, Offset int64
pkg flag, func UnquoteUsage(*Flag) (string, string)
pkg go/ast, type EmptyStmt struct, Implicit bool
@@ -874,6 +879,7 @@ pkg reflect, func FuncOf([]Type, []Type, bool) Type
pkg runtime, func ReadTrace() []uint8
pkg runtime, func StartTrace() error
pkg runtime, func StopTrace()
+pkg runtime, type MemStats struct, GCCPUFraction float64
pkg runtime/trace, func Start(io.Writer) error
pkg runtime/trace, func Stop()
pkg strings, func Compare(string, string) int