summaryrefslogtreecommitdiff
path: root/src/cmd/go/internal/base/base.go
diff options
context:
space:
mode:
authorJay Conrod <jayconrod@google.com>2019-12-11 13:16:35 -0500
committerJay Conrod <jayconrod@google.com>2020-04-06 18:06:41 +0000
commit74d6de03fd7db2c6faa7794620a9bcf0c4f018f2 (patch)
tree204c67aaa8e82be30da6fe004b68345d8c8a9405 /src/cmd/go/internal/base/base.go
parent7dc1c62cc9eb7a8c0c554dd6d67da9bd4ddeac1c (diff)
downloadgo-git-tls.tar.gz
cmd/go: report scan error position in 'go list -e'tls
This CL extracts some error handling code into a common method for presenting errors encountered when loading package data. Fixes #36087 Fixes #36762 Change-Id: I87c8d41e3cc6e6afa152d9c067bc60923bf19fbe Reviewed-on: https://go-review.googlesource.com/c/go/+/210938 Run-TryBot: Jay Conrod <jayconrod@google.com> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Michael Matloob <matloob@golang.org> Reviewed-by: Bryan C. Mills <bcmills@google.com>
Diffstat (limited to 'src/cmd/go/internal/base/base.go')
-rw-r--r--src/cmd/go/internal/base/base.go25
1 files changed, 0 insertions, 25 deletions
diff --git a/src/cmd/go/internal/base/base.go b/src/cmd/go/internal/base/base.go
index 272da55681..ab2f1bb4e2 100644
--- a/src/cmd/go/internal/base/base.go
+++ b/src/cmd/go/internal/base/base.go
@@ -7,11 +7,8 @@
package base
import (
- "bytes"
- "errors"
"flag"
"fmt"
- "go/scanner"
"log"
"os"
"os/exec"
@@ -172,25 +169,3 @@ func RunStdin(cmdline []string) {
// Usage is the usage-reporting function, filled in by package main
// but here for reference by other packages.
var Usage func()
-
-// ExpandScanner expands a scanner.List error into all the errors in the list.
-// The default Error method only shows the first error
-// and does not shorten paths.
-func ExpandScanner(err error) error {
- // Look for parser errors.
- if err, ok := err.(scanner.ErrorList); ok {
- // Prepare error with \n before each message.
- // When printed in something like context: %v
- // this will put the leading file positions each on
- // its own line. It will also show all the errors
- // instead of just the first, as err.Error does.
- var buf bytes.Buffer
- for _, e := range err {
- e.Pos.Filename = ShortPath(e.Pos.Filename)
- buf.WriteString("\n")
- buf.WriteString(e.Error())
- }
- return errors.New(buf.String())
- }
- return err
-}