diff options
| author | Bryan C. Mills <bcmills@google.com> | 2019-12-06 15:40:04 -0500 |
|---|---|---|
| committer | Bryan C. Mills <bcmills@google.com> | 2019-12-06 23:44:51 +0000 |
| commit | 94ddb2d6217e3d031cfacb8eed68786df9227bf1 (patch) | |
| tree | 95ec86901601b20998bcf338371e0d06fd880ea3 | |
| parent | 76d2f6cc6245d0e8876c29881570d218838c1068 (diff) | |
| download | go-94ddb2d6217e3d031cfacb8eed68786df9227bf1.tar.gz go-94ddb2d6217e3d031cfacb8eed68786df9227bf1.zip | |
cmd/go/internal/modload: revert duplicate path suppression in modload.ImportMissingError
CL 210338 suppressed duplication for import paths mentioned in an
ImportMissingError.
Unfortunately, that broke one of the cases in
cmd/go/internal/modload.TestImport, and the new error message is still
kind of awkward anyway.
Let's revert that part of the change — we can try again with more
coverage for that case.
Updates #35986
Change-Id: Ib0858aec4f89a7231e32c35ec876da80d80f2098
Reviewed-on: https://go-review.googlesource.com/c/go/+/210342
Run-TryBot: Bryan C. Mills <bcmills@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Jay Conrod <jayconrod@google.com>
| -rw-r--r-- | src/cmd/go/internal/modload/import.go | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/cmd/go/internal/modload/import.go b/src/cmd/go/internal/modload/import.go index c7508d1702..9ae2900e46 100644 --- a/src/cmd/go/internal/modload/import.go +++ b/src/cmd/go/internal/modload/import.go @@ -42,9 +42,6 @@ func (e *ImportMissingError) Error() string { if search.IsStandardImportPath(e.Path) { return fmt.Sprintf("package %s is not in GOROOT (%s)", e.Path, filepath.Join(cfg.GOROOT, "src", e.Path)) } - if i := load.ImportPathError(nil); errors.As(e.QueryErr, &i) { - return fmt.Sprintf("cannot find module: %v", e.QueryErr) - } if e.QueryErr != nil { return fmt.Sprintf("cannot find module providing package %s: %v", e.Path, e.QueryErr) } |