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

diff --git a/src/cmd/api/goapi.go b/src/cmd/api/goapi.go
index ff75f00e39a540be792a02db093374b6a091494d..46b5f3bae8a2f1c7199464bb71f7cfa1c9199bc5 100644 (file)
--- 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 1a86c0ec70c5e5a0de19041224728568fe65f3bc..226748ac4afe7f80aeeb7cf0bce5f15e12a7fb35 100644 (file)
--- 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