From b7e8f894e31a2c38d0fcb029c1a9584e8d66319b Mon Sep 17 00:00:00 2001 From: Colin Arnott Date: Fri, 22 Mar 2019 07:00:44 +0000 Subject: [PATCH] go/packages: rename golistDriverCurrent to golistDriver This fixes a naming preference missed in CL 166537. Since func golistDriverCurrent is no longer polymorphic, it was suggested we simply call it golistDriver. Change-Id: Ibf517365c20953628ede3457b9247efd8b79897c Reviewed-on: https://go-review.googlesource.com/c/tools/+/168837 Run-TryBot: Michael Matloob TryBot-Result: Gobot Gobot Reviewed-by: Michael Matloob --- go/packages/golist.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/go/packages/golist.go b/go/packages/golist.go index 71157599f6..be58c5ba78 100644 --- a/go/packages/golist.go +++ b/go/packages/golist.go @@ -128,7 +128,7 @@ extractQueries: // patterns also requires a go list call, since it's the equivalent of // ".". if len(restPatterns) > 0 || len(patterns) == 0 { - dr, err := golistDriverCurrent(cfg, restPatterns...) + dr, err := golistDriver(cfg, restPatterns...) if err != nil { return nil, err } @@ -147,13 +147,13 @@ extractQueries: var containsCandidates []string if len(containFiles) != 0 { - if err := runContainsQueries(cfg, golistDriverCurrent, response, containFiles); err != nil { + if err := runContainsQueries(cfg, golistDriver, response, containFiles); err != nil { return nil, err } } if len(packagesNamed) != 0 { - if err := runNamedQueries(cfg, golistDriverCurrent, response, packagesNamed); err != nil { + if err := runNamedQueries(cfg, golistDriver, response, packagesNamed); err != nil { return nil, err } } @@ -168,7 +168,7 @@ extractQueries: } if len(needPkgs) > 0 { - addNeededOverlayPackages(cfg, golistDriverCurrent, response, needPkgs) + addNeededOverlayPackages(cfg, golistDriver, response, needPkgs) if err != nil { return nil, err } @@ -540,10 +540,10 @@ func otherFiles(p *jsonPackage) [][]string { return [][]string{p.CFiles, p.CXXFiles, p.MFiles, p.HFiles, p.FFiles, p.SFiles, p.SwigFiles, p.SwigCXXFiles, p.SysoFiles} } -// golistDriverCurrent uses the "go list" command to expand the -// pattern words and return metadata for the specified packages. -// dir may be "" and env may be nil, as per os/exec.Command. -func golistDriverCurrent(cfg *Config, words ...string) (*driverResponse, error) { +// golistDriver uses the "go list" command to expand the pattern +// words and return metadata for the specified packages. dir may be +// "" and env may be nil, as per os/exec.Command. +func golistDriver(cfg *Config, words ...string) (*driverResponse, error) { // go list uses the following identifiers in ImportPath and Imports: // // "p" -- importable package or main (command)