cmd/go: remove Package.constraintIgnoredGoFiles

Now all of IgnoredGoFiles is constraint-ignored Go files.

Change-Id: I03001796c290708ab835526250c619dd667a8607
Reviewed-on: https://go-review.googlesource.com/c/go/+/240552
Trust: Russ Cox <rsc@golang.org>
Run-TryBot: Russ Cox <rsc@golang.org>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Jay Conrod <jayconrod@google.com>

diff --git a/src/cmd/go/internal/load/pkg.go b/src/cmd/go/internal/load/pkg.go
index 5cc77915e7c23154bab8c812ef4914ec4a212371..ffa083f2f0c08692bad70f6e31776d512a24d41c 100644 (file)
--- a/src/cmd/go/internal/load/pkg.go
+++ b/src/cmd/go/internal/load/pkg.go
@@ -185,7 +185,7 @@ type NoGoError struct {
 }
 
 func (e *NoGoError) Error() string {
-       if len(e.Package.constraintIgnoredGoFiles()) > 0 {
+       if len(e.Package.IgnoredGoFiles) > 0 {
                // Go files exist, but they were ignored due to build constraints.
                return "build constraints exclude all Go files in " + e.Package.Dir
        }
@@ -2009,22 +2009,7 @@ func (p *Package) InternalXGoFiles() []string {
 // using absolute paths. "Possibly relevant" means that files are not excluded
 // due to build tags, but files with names beginning with . or _ are still excluded.
 func (p *Package) InternalAllGoFiles() []string {
-       return p.mkAbs(str.StringList(p.constraintIgnoredGoFiles(), p.GoFiles, p.CgoFiles, p.TestGoFiles, p.XTestGoFiles))
-}
-
-// constraintIgnoredGoFiles returns the list of Go files ignored for reasons
-// other than having a name beginning with '.' or '_'.
-func (p *Package) constraintIgnoredGoFiles() []string {
-       if len(p.IgnoredGoFiles) == 0 {
-               return nil
-       }
-       files := make([]string, 0, len(p.IgnoredGoFiles))
-       for _, f := range p.IgnoredGoFiles {
-               if f != "" && f[0] != '.' && f[0] != '_' {
-                       files = append(files, f)
-               }
-       }
-       return files
+       return p.mkAbs(str.StringList(p.IgnoredGoFiles, p.GoFiles, p.CgoFiles, p.TestGoFiles, p.XTestGoFiles))
 }
 
 // usesSwig reports whether the package needs to run SWIG.