Commit cb3dc8ba authored by Russ Cox's avatar Russ Cox

cmd/go: drop PackageInternal.External, SFiles

These are no longer used.

Change-Id: I17fa29bbf90b1a41109fde4504eeff06af1eb8be
Reviewed-on: https://go-review.googlesource.com/56281
Run-TryBot: Russ Cox <rsc@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: default avatarDave Cheney <dave@cheney.net>
parent 9735fcfc
...@@ -93,15 +93,13 @@ type PackagePublic struct { ...@@ -93,15 +93,13 @@ type PackagePublic struct {
type PackageInternal struct { type PackageInternal struct {
// Unexported fields are not part of the public API. // Unexported fields are not part of the public API.
Build *build.Package Build *build.Package
Pkgdir string // overrides build.PkgDir Pkgdir string // overrides build.PkgDir
Imports []*Package // this package's direct imports Imports []*Package // this package's direct imports
GoFiles []string // GoFiles+CgoFiles+TestGoFiles+XTestGoFiles files, absolute paths GoFiles []string // GoFiles+CgoFiles+TestGoFiles+XTestGoFiles files, absolute paths
SFiles []string
AllGoFiles []string // gofiles + IgnoredGoFiles, absolute paths AllGoFiles []string // gofiles + IgnoredGoFiles, absolute paths
Target string // installed file for this package (may be executable) Target string // installed file for this package (may be executable)
Pkgfile string // where package will be (or is already) built or installed Pkgfile string // where package will be (or is already) built or installed
Fake bool // synthesized package Fake bool // synthesized package
External bool // synthesized external test package
ForceLibrary bool // this package is a library (even if named "main") ForceLibrary bool // this package is a library (even if named "main")
Cmdline bool // defined by files listed on command line Cmdline bool // defined by files listed on command line
Local bool // imported via local path (./ or ../) Local bool // imported via local path (./ or ../)
...@@ -991,12 +989,6 @@ func (p *Package) load(stk *ImportStack, bp *build.Package, err error) { ...@@ -991,12 +989,6 @@ func (p *Package) load(stk *ImportStack, bp *build.Package, err error) {
} }
sort.Strings(p.Internal.GoFiles) sort.Strings(p.Internal.GoFiles)
p.Internal.SFiles = str.StringList(p.SFiles)
for i := range p.Internal.SFiles {
p.Internal.SFiles[i] = filepath.Join(p.Dir, p.Internal.SFiles[i])
}
sort.Strings(p.Internal.SFiles)
p.Internal.AllGoFiles = str.StringList(p.IgnoredGoFiles) p.Internal.AllGoFiles = str.StringList(p.IgnoredGoFiles)
for i := range p.Internal.AllGoFiles { for i := range p.Internal.AllGoFiles {
p.Internal.AllGoFiles[i] = filepath.Join(p.Dir, p.Internal.AllGoFiles[i]) p.Internal.AllGoFiles[i] = filepath.Join(p.Dir, p.Internal.AllGoFiles[i])
......
...@@ -832,9 +832,8 @@ func builderTest(b *work.Builder, p *load.Package) (buildAction, runAction, prin ...@@ -832,9 +832,8 @@ func builderTest(b *work.Builder, p *load.Package) (buildAction, runAction, prin
Build: &build.Package{ Build: &build.Package{
ImportPos: p.Internal.Build.XTestImportPos, ImportPos: p.Internal.Build.XTestImportPos,
}, },
Imports: ximports, Imports: ximports,
Fake: true, Fake: true,
External: true,
}, },
} }
if pxtestNeedsPtest { if pxtestNeedsPtest {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment