summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@golang.org>2013-05-14 09:43:56 -0700
committerBrad Fitzpatrick <bradfitz@golang.org>2013-05-14 09:43:56 -0700
commit2184282308566ad6fd445ea55ab755019e360d77 (patch)
tree4b88d19b2041605c520a73ed66982426df0f987d /src
parent67acff0b09a187c56debc6cae23495ecc8ef3205 (diff)
downloadgo-git-2184282308566ad6fd445ea55ab755019e360d77.tar.gz
cmd/api: don't print out except.txt removed features to stdout
It's just noise. They've already been acknowledged in except.txt. R=golang-dev, r CC=golang-dev https://golang.org/cl/9392047
Diffstat (limited to 'src')
-rw-r--r--src/cmd/api/goapi.go7
-rw-r--r--src/cmd/api/goapi_test.go2
2 files changed, 7 insertions, 2 deletions
diff --git a/src/cmd/api/goapi.go b/src/cmd/api/goapi.go
index ff75f00e39..46b5f3bae8 100644
--- a/src/cmd/api/goapi.go
+++ b/src/cmd/api/goapi.go
@@ -231,7 +231,12 @@ func compareAPI(w io.Writer, features, required, optional, exception []string) (
case len(features) == 0 || (len(required) > 0 && required[0] < features[0]):
feature := take(&required)
if exceptionSet[feature] {
- fmt.Fprintf(w, "~%s\n", feature)
+ // An "unfortunate" case: the feature was once
+ // included in the API (e.g. go1.txt), but was
+ // subsequently removed. These are already
+ // acknowledged by being in the file
+ // "api/except.txt". No need to print them out
+ // here.
} else if featureSet[featureWithoutContext(feature)] {
// okay.
} else {
diff --git a/src/cmd/api/goapi_test.go b/src/cmd/api/goapi_test.go
index 1a86c0ec70..226748ac4a 100644
--- a/src/cmd/api/goapi_test.go
+++ b/src/cmd/api/goapi_test.go
@@ -110,7 +110,7 @@ func TestCompareAPI(t *testing.T) {
features: []string{"A", "C"},
exception: []string{"B"},
ok: true,
- out: "~B\n",
+ out: "",
},
{
// http://golang.org/issue/4303