diff options
| author | Dmitri Shuralyov <dmitshur@golang.org> | 2020-11-17 18:32:51 -0500 |
|---|---|---|
| committer | Dmitri Shuralyov <dmitshur@golang.org> | 2020-11-17 18:32:51 -0500 |
| commit | 0985c1bd2d388834fd43fb95366c673ab9f7c832 (patch) | |
| tree | 958dc76330d50a1ce0ae41de6334cfc5df99639a /api | |
| parent | af814af6e7b48e0aa2784203297c0ba69fe9de5c (diff) | |
| parent | a413908dd064de6e3ea5b8d95d707a532bd3f4c8 (diff) | |
| download | go-0985c1bd2d388834fd43fb95366c673ab9f7c832.tar.gz go-0985c1bd2d388834fd43fb95366c673ab9f7c832.zip | |
[dev.boringcrypto] all: merge master into dev.boringcrypto
Change-Id: I0596a40722bf62952bd2eba85ccf3f104de589e4
Diffstat (limited to 'api')
| -rw-r--r-- | api/except.txt | 1 | ||||
| -rw-r--r-- | api/go1.15.txt | 2 | ||||
| -rw-r--r-- | api/next.txt | 19 |
3 files changed, 20 insertions, 2 deletions
diff --git a/api/except.txt b/api/except.txt index ccfdf06c55..962bb14271 100644 --- a/api/except.txt +++ b/api/except.txt @@ -456,3 +456,4 @@ pkg syscall (freebsd-arm-cgo), type Statfs_t struct, Mntonname [88]int8 pkg text/scanner, const GoTokens = 1012 pkg unicode, const Version = "10.0.0" pkg unicode, const Version = "11.0.0" +pkg unicode, const Version = "12.0.0" diff --git a/api/go1.15.txt b/api/go1.15.txt index b51837cf38..dd90506eba 100644 --- a/api/go1.15.txt +++ b/api/go1.15.txt @@ -112,8 +112,6 @@ pkg debug/pe, const IMAGE_SUBSYSTEM_WINDOWS_GUI = 2 pkg debug/pe, const IMAGE_SUBSYSTEM_WINDOWS_GUI ideal-int pkg debug/pe, const IMAGE_SUBSYSTEM_XBOX = 14 pkg debug/pe, const IMAGE_SUBSYSTEM_XBOX ideal-int -pkg go/printer, const StdFormat = 16 -pkg go/printer, const StdFormat Mode pkg math/big, method (*Int) FillBytes([]uint8) []uint8 pkg net, method (*Resolver) LookupIP(context.Context, string, string) ([]IP, error) pkg net/url, method (*URL) EscapedFragment() string diff --git a/api/next.txt b/api/next.txt index e69de29bb2..076f39ec34 100644 --- a/api/next.txt +++ b/api/next.txt @@ -0,0 +1,19 @@ +pkg unicode, const Version = "13.0.0" +pkg unicode, var Chorasmian *RangeTable +pkg unicode, var Dives_Akuru *RangeTable +pkg unicode, var Khitan_Small_Script *RangeTable +pkg unicode, var Yezidi *RangeTable +pkg text/template/parse, const NodeComment = 20 +pkg text/template/parse, const NodeComment NodeType +pkg text/template/parse, const ParseComments = 1 +pkg text/template/parse, const ParseComments Mode +pkg text/template/parse, method (*CommentNode) Copy() Node +pkg text/template/parse, method (*CommentNode) String() string +pkg text/template/parse, method (CommentNode) Position() Pos +pkg text/template/parse, method (CommentNode) Type() NodeType +pkg text/template/parse, type CommentNode struct +pkg text/template/parse, type CommentNode struct, Text string +pkg text/template/parse, type CommentNode struct, embedded NodeType +pkg text/template/parse, type CommentNode struct, embedded Pos +pkg text/template/parse, type Mode uint +pkg text/template/parse, type Tree struct, Mode Mode |