diff options
author | Rebecca Stambler <rstambler@golang.org> | 2020-04-02 17:27:48 -0400 |
---|---|---|
committer | Rebecca Stambler <rstambler@golang.org> | 2020-04-03 19:08:13 +0000 |
commit | 44a64ad78b9b521790ab78240c17a3bc75b5eaa7 (patch) | |
tree | 1adfa0be1d2f34d18b83e4254f85d1c0784ffa00 /go | |
parent | 4480df5f16277fac3c49dbd103521626b10718a5 (diff) | |
download | golang-x-tools-44a64ad78b9b521790ab78240c17a3bc75b5eaa7.tar.gz |
internal/lsp, go/packages: don't log context cancellation errors
Instead of checking the context, check the error. This may expose some
errors that are not wrapped correctly. Replaced all uses of errors
with golang.org/x/xerrors.
Change-Id: Ia40160f8ea352e02618765f2a9415a4ece0dcd94
Reviewed-on: https://go-review.googlesource.com/c/tools/+/227036
Run-TryBot: Rebecca Stambler <rstambler@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Robert Findley <rfindley@google.com>
Diffstat (limited to 'go')
-rw-r--r-- | go/packages/golist.go | 3 | ||||
-rw-r--r-- | go/packages/loadmode_string.go | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/go/packages/golist.go b/go/packages/golist.go index f37824266..099207d78 100644 --- a/go/packages/golist.go +++ b/go/packages/golist.go @@ -25,6 +25,7 @@ import ( "golang.org/x/tools/go/internal/packagesdriver" "golang.org/x/tools/internal/gocommand" "golang.org/x/tools/internal/packagesinternal" + "golang.org/x/xerrors" ) // debug controls verbose logging. @@ -736,7 +737,7 @@ func (state *golistState) invokeGo(verb string, args ...string) (*bytes.Buffer, if !ok { // Catastrophic error: // - context cancellation - return nil, fmt.Errorf("couldn't run 'go': %v", err) + return nil, xerrors.Errorf("couldn't run 'go': %w", err) } // Old go version? diff --git a/go/packages/loadmode_string.go b/go/packages/loadmode_string.go index aff94a3fe..7ea37e7ee 100644 --- a/go/packages/loadmode_string.go +++ b/go/packages/loadmode_string.go @@ -38,7 +38,7 @@ var modeStrings = []string{ func (mod LoadMode) String() string { m := mod if m == 0 { - return fmt.Sprintf("LoadMode(0)") + return "LoadMode(0)" } var out []string for i, x := range allModes { |