diff options
| author | Jay Conrod <jayconrod@google.com> | 2021-04-15 18:06:45 -0400 |
|---|---|---|
| committer | Jay Conrod <jayconrod@google.com> | 2021-04-16 14:15:42 +0000 |
| commit | dc76c4756599ac4bd9644e407aa2af9f9c8a3bdc (patch) | |
| tree | f8b57a4e4cee0ca04911f6d0ccd2d727df09ac87 /src/cmd/go/internal/modget/get.go | |
| parent | cde92846e227425df8258cafade02497a60e421e (diff) | |
| download | go-dc76c4756599ac4bd9644e407aa2af9f9c8a3bdc.tar.gz go-dc76c4756599ac4bd9644e407aa2af9f9c8a3bdc.zip | |
cmd/go/internal/load: convert two global flags to an options struct
PackageOpts is a new struct type accepted by package loading
functions. It initially has two fields: IgnoreImports, and
ModResolveTests. Previously, these were global variables set by
clients. We'll add more to this in the future.
For #40775
Change-Id: I6956e56502de836d3815ce788bdf16fc5f3e5338
Reviewed-on: https://go-review.googlesource.com/c/go/+/310669
Trust: Jay Conrod <jayconrod@google.com>
Run-TryBot: Jay Conrod <jayconrod@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Bryan C. Mills <bcmills@google.com>
Diffstat (limited to 'src/cmd/go/internal/modget/get.go')
| -rw-r--r-- | src/cmd/go/internal/modget/get.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cmd/go/internal/modget/get.go b/src/cmd/go/internal/modget/get.go index 876d8ab24d..7e6226b0be 100644 --- a/src/cmd/go/internal/modget/get.go +++ b/src/cmd/go/internal/modget/get.go @@ -276,7 +276,6 @@ func runGet(ctx context.Context, cmd *base.Command, args []string) { if *getInsecure { base.Fatalf("go get: -insecure flag is no longer supported; use GOINSECURE instead") } - load.ModResolveTests = *getT // Do not allow any updating of go.mod until we've applied // all the requested changes and checked that the result matches @@ -368,8 +367,9 @@ func runGet(ctx context.Context, cmd *base.Command, args []string) { if !*getD && len(pkgPatterns) > 0 { work.BuildInit() + pkgOpts := load.PackageOpts{ModResolveTests: *getT} var pkgs []*load.Package - for _, pkg := range load.PackagesAndErrors(ctx, pkgPatterns) { + for _, pkg := range load.PackagesAndErrors(ctx, pkgOpts, pkgPatterns) { if pkg.Error != nil { var noGo *load.NoGoError if errors.As(pkg.Error.Err, &noGo) { |