aboutsummaryrefslogtreecommitdiff
path: root/src/cmd/go/internal/modload/load.go
diff options
context:
space:
mode:
authorMichael Matloob <matloob@golang.org>2020-04-17 13:01:38 -0400
committerMichael Matloob <matloob@golang.org>2020-05-06 19:03:06 +0000
commit641918ee09cb44d282a30ee8b66f99a0b63eaef9 (patch)
tree074d235783922ba1d2a714461e9e2de2aff16152 /src/cmd/go/internal/modload/load.go
parente538b7e931c209706c3e8c1b0c2d53dab651b965 (diff)
downloadgo-641918ee09cb44d282a30ee8b66f99a0b63eaef9.tar.gz
go-641918ee09cb44d282a30ee8b66f99a0b63eaef9.zip
cmd/go: add positions for load errors in call to load
This CL sets positions for errors from cals to load within the load call itself, similar to how the rest of the code in pkg.go sets positions right after the error is set on the package. This allows the code to ensure that we only add positions either for ImportPathErrors, or if an error was passed into load, and was set using setLoadPackageDataError. (Though I'm wondering if the call to setLoadPackageDataError should be done before the call to load). Fixes #38034 Change-Id: I0748866933b4c1a329954b4b96640bef702a4644 Reviewed-on: https://go-review.googlesource.com/c/go/+/228784 Reviewed-by: Bryan C. Mills <bcmills@google.com> Reviewed-by: Jay Conrod <jayconrod@google.com> Run-TryBot: Bryan C. Mills <bcmills@google.com>
Diffstat (limited to 'src/cmd/go/internal/modload/load.go')
-rw-r--r--src/cmd/go/internal/modload/load.go17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/cmd/go/internal/modload/load.go b/src/cmd/go/internal/modload/load.go
index 21601cb13e..8a02c750e1 100644
--- a/src/cmd/go/internal/modload/load.go
+++ b/src/cmd/go/internal/modload/load.go
@@ -6,6 +6,14 @@ package modload
import (
"bytes"
+ "cmd/go/internal/base"
+ "cmd/go/internal/cfg"
+ "cmd/go/internal/imports"
+ "cmd/go/internal/modfetch"
+ "cmd/go/internal/mvs"
+ "cmd/go/internal/par"
+ "cmd/go/internal/search"
+ "cmd/go/internal/str"
"errors"
"fmt"
"go/build"
@@ -16,15 +24,6 @@ import (
"sort"
"strings"
- "cmd/go/internal/base"
- "cmd/go/internal/cfg"
- "cmd/go/internal/imports"
- "cmd/go/internal/modfetch"
- "cmd/go/internal/mvs"
- "cmd/go/internal/par"
- "cmd/go/internal/search"
- "cmd/go/internal/str"
-
"golang.org/x/mod/module"
)