close_issue_1
/
tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

go/packages: cleanup style 

This change addresses some style issues pointed out by rsc in
golang.org/cl/126177. It doesn't fix the comment on listfunc
or the comment on the processing of the containing directories.
Those will be handled in a separate cl.

Change-Id: I2094ad1e5e2ee181a646466675f4d993bd69ff9b
Reviewed-on: https://go-review.googlesource.com/128897
Run-TryBot: Michael Matloob <matloob@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Russ Cox <rsc@golang.org>
Reviewed-by: Alan Donovan <adonovan@google.com>
This commit is contained in:
Michael Matloob 2018-08-09 15:43:28 -04:00
parent 0167fde410
commit aaa76ee82d
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
go/packages/golist/golist.go
View File

@ -44,18 +44,17 @@ func LoadRaw(ctx context.Context, cfg *raw.Config, patterns ...string) ([]string
} }
// Determine files requested in contains patterns // Determine files requested in contains patterns
var containFiles []string var containFiles []string
{ restPatterns := make([]string, 0, len(patterns))
restPatterns := make([]string, 0, len(patterns)) for _, pattern := range patterns {
for _, pattern := range patterns { if strings.HasPrefix(pattern, "contains:") {
if containFile := strings.TrimPrefix(pattern, "contains:"); containFile != pattern { containFile := strings.TrimPrefix(pattern, "contains:")
containFiles = append(containFiles, containFile) containFiles = append(containFiles, containFile)
} else { } else {
restPatterns = append(restPatterns, pattern) restPatterns = append(restPatterns, pattern)
}
} }
containFiles = absJoin(cfg.Dir, containFiles)
patterns = restPatterns
} }
containFiles = absJoin(cfg.Dir, containFiles)
patterns = restPatterns
// TODO(matloob): Remove the definition of listfunc and just use golistPackages once go1.12 is released. // TODO(matloob): Remove the definition of listfunc and just use golistPackages once go1.12 is released.
var listfunc func(ctx context.Context, cfg *raw.Config, words ...string) ([]string, []*raw.Package, error) var listfunc func(ctx context.Context, cfg *raw.Config, words ...string) ([]string, []*raw.Package, error)

4
go/packages/packages.go
View File

@ -258,8 +258,8 @@ func newLoader(cfg *Config) *loader {
ld.Context = context.Background() ld.Context = context.Background()
} }
if ld.Dir == "" { if ld.Dir == "" {
if cwd, err := os.Getwd(); err == nil { if dir, err := os.Getwd(); err == nil {
ld.Dir = cwd ld.Dir = dir
} }
} }