Commit 13f7fe00 authored by Russ Cox's avatar Russ Cox

cmd/go: rename local variable ImportPaths to importPaths

ImportPaths is also the name of a top-level function.
It is confusing to have a capitalized local variable.

Change-Id: I1313e05ade4934d4ee250a67e5af6d1bd6229aca
Reviewed-on: https://go-review.googlesource.com/56275
Run-TryBot: Russ Cox <rsc@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: default avatarIan Lance Taylor <iant@golang.org>
parent dca29095
...@@ -940,16 +940,16 @@ func (p *Package) load(stk *ImportStack, bp *build.Package, err error) *Package ...@@ -940,16 +940,16 @@ func (p *Package) load(stk *ImportStack, bp *build.Package, err error) *Package
} }
} }
ImportPaths := p.Imports importPaths := p.Imports
// Packages that use cgo import runtime/cgo implicitly. // Packages that use cgo import runtime/cgo implicitly.
// Packages that use cgo also import syscall implicitly, // Packages that use cgo also import syscall implicitly,
// to wrap errno. // to wrap errno.
// Exclude certain packages to avoid circular dependencies. // Exclude certain packages to avoid circular dependencies.
if len(p.CgoFiles) > 0 && (!p.Standard || !cgoExclude[p.ImportPath]) { if len(p.CgoFiles) > 0 && (!p.Standard || !cgoExclude[p.ImportPath]) {
ImportPaths = append(ImportPaths, "runtime/cgo") importPaths = append(importPaths, "runtime/cgo")
} }
if len(p.CgoFiles) > 0 && (!p.Standard || !cgoSyscallExclude[p.ImportPath]) { if len(p.CgoFiles) > 0 && (!p.Standard || !cgoSyscallExclude[p.ImportPath]) {
ImportPaths = append(ImportPaths, "syscall") importPaths = append(importPaths, "syscall")
} }
if cfg.BuildContext.CgoEnabled && p.Name == "main" && !p.Goroot { if cfg.BuildContext.CgoEnabled && p.Name == "main" && !p.Goroot {
...@@ -969,26 +969,26 @@ func (p *Package) load(stk *ImportStack, bp *build.Package, err error) *Package ...@@ -969,26 +969,26 @@ func (p *Package) load(stk *ImportStack, bp *build.Package, err error) *Package
} }
} }
if cfg.BuildBuildmode == "c-shared" || cfg.BuildBuildmode == "plugin" || pieCgo || cfg.BuildLinkshared || linkmodeExternal { if cfg.BuildBuildmode == "c-shared" || cfg.BuildBuildmode == "plugin" || pieCgo || cfg.BuildLinkshared || linkmodeExternal {
ImportPaths = append(ImportPaths, "runtime/cgo") importPaths = append(importPaths, "runtime/cgo")
} }
} }
// Everything depends on runtime, except runtime, its internal // Everything depends on runtime, except runtime, its internal
// subpackages, and unsafe. // subpackages, and unsafe.
if !p.Standard || (p.ImportPath != "runtime" && !strings.HasPrefix(p.ImportPath, "runtime/internal/") && p.ImportPath != "unsafe") { if !p.Standard || (p.ImportPath != "runtime" && !strings.HasPrefix(p.ImportPath, "runtime/internal/") && p.ImportPath != "unsafe") {
ImportPaths = append(ImportPaths, "runtime") importPaths = append(importPaths, "runtime")
// When race detection enabled everything depends on runtime/race. // When race detection enabled everything depends on runtime/race.
// Exclude certain packages to avoid circular dependencies. // Exclude certain packages to avoid circular dependencies.
if cfg.BuildRace && (!p.Standard || !raceExclude[p.ImportPath]) { if cfg.BuildRace && (!p.Standard || !raceExclude[p.ImportPath]) {
ImportPaths = append(ImportPaths, "runtime/race") importPaths = append(importPaths, "runtime/race")
} }
// MSan uses runtime/msan. // MSan uses runtime/msan.
if cfg.BuildMSan && (!p.Standard || !raceExclude[p.ImportPath]) { if cfg.BuildMSan && (!p.Standard || !raceExclude[p.ImportPath]) {
ImportPaths = append(ImportPaths, "runtime/msan") importPaths = append(importPaths, "runtime/msan")
} }
// On ARM with GOARM=5, everything depends on math for the link. // On ARM with GOARM=5, everything depends on math for the link.
if p.Name == "main" && cfg.Goarch == "arm" { if p.Name == "main" && cfg.Goarch == "arm" {
ImportPaths = append(ImportPaths, "math") importPaths = append(importPaths, "math")
} }
} }
...@@ -997,7 +997,7 @@ func (p *Package) load(stk *ImportStack, bp *build.Package, err error) *Package ...@@ -997,7 +997,7 @@ func (p *Package) load(stk *ImportStack, bp *build.Package, err error) *Package
// This can be an issue particularly for runtime/internal/atomic; // This can be an issue particularly for runtime/internal/atomic;
// see issue 13655. // see issue 13655.
if p.Standard && (p.ImportPath == "runtime" || strings.HasPrefix(p.ImportPath, "runtime/internal/")) && p.ImportPath != "runtime/internal/sys" { if p.Standard && (p.ImportPath == "runtime" || strings.HasPrefix(p.ImportPath, "runtime/internal/")) && p.ImportPath != "runtime/internal/sys" {
ImportPaths = append(ImportPaths, "runtime/internal/sys") importPaths = append(importPaths, "runtime/internal/sys")
} }
// Build list of full paths to all Go files in the package, // Build list of full paths to all Go files in the package,
...@@ -1062,7 +1062,7 @@ func (p *Package) load(stk *ImportStack, bp *build.Package, err error) *Package ...@@ -1062,7 +1062,7 @@ func (p *Package) load(stk *ImportStack, bp *build.Package, err error) *Package
} }
} }
for i, path := range ImportPaths { for i, path := range importPaths {
if path == "C" { if path == "C" {
continue continue
} }
...@@ -1079,7 +1079,7 @@ func (p *Package) load(stk *ImportStack, bp *build.Package, err error) *Package ...@@ -1079,7 +1079,7 @@ func (p *Package) load(stk *ImportStack, bp *build.Package, err error) *Package
} }
path = p1.ImportPath path = p1.ImportPath
ImportPaths[i] = path importPaths[i] = path
if i < len(p.Imports) { if i < len(p.Imports) {
p.Imports[i] = path p.Imports[i] = path
} }
......
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