aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@golang.org>2016-12-21 03:24:08 +0000
committerBrad Fitzpatrick <bradfitz@golang.org>2016-12-21 05:25:57 +0000
commit09c411da1dd2c02c8f6ed5bc147ac779d55a2ce6 (patch)
tree8b449e3e80ef5512c6eab8dd0ba38f32c6563a70
parent27fb26c77c0374ec1876223593078e4d6b98d4f0 (diff)
downloadgo-09c411da1dd2c02c8f6ed5bc147ac779d55a2ce6.tar.gz
go-09c411da1dd2c02c8f6ed5bc147ac779d55a2ce6.zip
Revert "cmd/go: note when some Go files were ignored on no-Go-files errors"
This reverts commit eee727d0855b9e78f9df87e08d57b1d7f264876c (https://golang.org/cl/29113) The " (.go files ignored due to build tags)" error message is not always accurate. Fixes #18396 Updates #17008 Change-Id: I609653120603a7f6094bc1dc3a83856f4b259241 Reviewed-on: https://go-review.googlesource.com/34662 Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Russ Cox <rsc@golang.org>
-rw-r--r--api/go1.8.txt1
-rw-r--r--src/go/build/build.go11
-rw-r--r--src/go/build/build_test.go11
-rw-r--r--src/go/build/testdata/ignored/ignored.go3
4 files changed, 3 insertions, 23 deletions
diff --git a/api/go1.8.txt b/api/go1.8.txt
index 5e21b07d03..fca7e03c9f 100644
--- a/api/go1.8.txt
+++ b/api/go1.8.txt
@@ -176,7 +176,6 @@ pkg expvar, method (*Float) Value() float64
pkg expvar, method (Func) Value() interface{}
pkg expvar, method (*Int) Value() int64
pkg expvar, method (*String) Value() string
-pkg go/build, type NoGoError struct, Ignored bool
pkg go/doc, func IsPredeclared(string) bool
pkg go/types, func Default(Type) Type
pkg go/types, func IdenticalIgnoreTags(Type, Type) bool
diff --git a/src/go/build/build.go b/src/go/build/build.go
index ea37bbbcb5..da12d50bb1 100644
--- a/src/go/build/build.go
+++ b/src/go/build/build.go
@@ -439,16 +439,11 @@ func (ctxt *Context) ImportDir(dir string, mode ImportMode) (*Package, error) {
// containing no buildable Go source files. (It may still contain
// test files, files hidden by build tags, and so on.)
type NoGoError struct {
- Dir string
- Ignored bool // whether any Go files were ignored due to build tags
+ Dir string
}
func (e *NoGoError) Error() string {
- msg := "no buildable Go source files in " + e.Dir
- if e.Ignored {
- msg += " (.go files ignored due to build tags)"
- }
- return msg
+ return "no buildable Go source files in " + e.Dir
}
// MultiplePackageError describes a directory containing
@@ -880,7 +875,7 @@ Found:
return p, badGoError
}
if len(p.GoFiles)+len(p.CgoFiles)+len(p.TestGoFiles)+len(p.XTestGoFiles) == 0 {
- return p, &NoGoError{Dir: p.Dir, Ignored: len(p.IgnoredGoFiles) > 0}
+ return p, &NoGoError{p.Dir}
}
for tag := range allTags {
diff --git a/src/go/build/build_test.go b/src/go/build/build_test.go
index 8ca8e5e04d..a9972416ef 100644
--- a/src/go/build/build_test.go
+++ b/src/go/build/build_test.go
@@ -93,17 +93,6 @@ func TestEmptyFolderImport(t *testing.T) {
}
}
-func TestIgnoredGoFilesImport(t *testing.T) {
- _, err := Import(".", "testdata/ignored", 0)
- e, ok := err.(*NoGoError)
- if !ok {
- t.Fatal(`Import("testdata/ignored") did not return NoGoError.`)
- }
- if !e.Ignored {
- t.Fatal(`Import("testdata/ignored") should have ignored Go files.`)
- }
-}
-
func TestMultiplePackageImport(t *testing.T) {
_, err := Import(".", "testdata/multi", 0)
mpe, ok := err.(*MultiplePackageError)
diff --git a/src/go/build/testdata/ignored/ignored.go b/src/go/build/testdata/ignored/ignored.go
deleted file mode 100644
index 48a2ae88f4..0000000000
--- a/src/go/build/testdata/ignored/ignored.go
+++ /dev/null
@@ -1,3 +0,0 @@
-// +build alwaysignore
-
-package ignored