summaryrefslogtreecommitdiff
path: root/api
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2013-08-14 00:20:55 -0400
committerRuss Cox <rsc@golang.org>2013-08-14 00:20:55 -0400
commita61cd49a6a1a2e0293d93fd86f2bd23508e6f477 (patch)
tree007117939e27230d8f8587afef06ca9a1553d5f5 /api
parent4544129b17d309ce48ceb324306f7254e808e387 (diff)
downloadgo-a61cd49a6a1a2e0293d93fd86f2bd23508e6f477.tar.gz
undo CL 12603044 / 2ca230b93195
fat fingers - did not intend to submit. depends on the Unmarshaler CL anyway. ??? original CL description encoding/xml: add, support Marshaler interface See golang.org/s/go12xml for design. Fixes issue 2771. Fixes issue 4169. Fixes issue 5975. Fixes issue 6125. R=golang-dev, iant, dan.kortschak CC=golang-dev https://codereview.appspot.com/12603044 ??? TBR=golang-dev CC=golang-dev https://codereview.appspot.com/12918043
Diffstat (limited to 'api')
-rw-r--r--api/go1.1.txt1
-rw-r--r--api/go1.txt7
2 files changed, 8 insertions, 0 deletions
diff --git a/api/go1.1.txt b/api/go1.1.txt
index 7cde99f13..2362a75f9 100644
--- a/api/go1.1.txt
+++ b/api/go1.1.txt
@@ -92,6 +92,7 @@ pkg encoding/json, method (Number) String() string
pkg encoding/json, type Number string
pkg encoding/xml, func EscapeText(io.Writer, []uint8) error
pkg encoding/xml, method (*Encoder) Indent(string, string)
+pkg encoding/xml, method (Encoder) ReadFrom(io.Reader) (int64, error)
pkg encoding/xml, type Decoder struct, DefaultSpace string
pkg go/ast, func NewCommentMap(*token.FileSet, Node, []*CommentGroup) CommentMap
pkg go/ast, method (CommentMap) Comments() []*CommentGroup
diff --git a/api/go1.txt b/api/go1.txt
index 5e3dea5a3..0d2e7c630 100644
--- a/api/go1.txt
+++ b/api/go1.txt
@@ -2425,6 +2425,13 @@ pkg encoding/xml, method (*UnsupportedTypeError) Error() string
pkg encoding/xml, method (CharData) Copy() CharData
pkg encoding/xml, method (Comment) Copy() Comment
pkg encoding/xml, method (Directive) Copy() Directive
+pkg encoding/xml, method (Encoder) Available() int
+pkg encoding/xml, method (Encoder) Buffered() int
+pkg encoding/xml, method (Encoder) Flush() error
+pkg encoding/xml, method (Encoder) Write([]uint8) (int, error)
+pkg encoding/xml, method (Encoder) WriteByte(uint8) error
+pkg encoding/xml, method (Encoder) WriteRune(int32) (int, error)
+pkg encoding/xml, method (Encoder) WriteString(string) (int, error)
pkg encoding/xml, method (ProcInst) Copy() ProcInst
pkg encoding/xml, method (StartElement) Copy() StartElement
pkg encoding/xml, method (UnmarshalError) Error() string