diff options
| author | Michael Matloob <matloob@golang.org> | 2026-03-31 14:43:38 -0400 |
|---|---|---|
| committer | Gopher Robot <gobot@golang.org> | 2026-03-31 22:06:52 -0700 |
| commit | 50f94b1dcd45b88c61d73fce2ec56cedc4c13b14 (patch) | |
| tree | 4ea03ec406612c7de3afe83fc1fd88a4add44442 /src | |
| parent | b5b9e3cdfee825829c95205dcae3e1d528990cd9 (diff) | |
| download | go-50f94b1dcd45b88c61d73fce2ec56cedc4c13b14.tar.xz | |
cmd/go/internal/doc: follow up to CL 733200
I submitted a rebased variant of the CL that dropped changes in
response to Sean Liao and Ian Alexander's comments.
Add the bug updates below and re-implement Ian's suggestion.
Fixes #34750
For #53446
For #60645
Change-Id: Ie132ac65efd27e811edabfbbb083b6946a6a6964
Reviewed-on: https://go-review.googlesource.com/c/go/+/761580
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Auto-Submit: Michael Matloob <matloob@golang.org>
Reviewed-by: Michael Matloob <matloob@google.com>
Reviewed-by: Ian Alexander <jitsu@google.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/cmd/go/internal/doc/doc.go | 2 | ||||
| -rw-r--r-- | src/cmd/go/internal/modload/init.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/cmd/go/internal/doc/doc.go b/src/cmd/go/internal/doc/doc.go index 3ebd0f5dab..5a7c1a458c 100644 --- a/src/cmd/go/internal/doc/doc.go +++ b/src/cmd/go/internal/doc/doc.go @@ -373,7 +373,7 @@ func parseArgs(ctx context.Context, flagSet *flag.FlagSet, args []string) (pkg * } loader := modload.NewState() if testGOPATH { - loader = modload.DisabledState() + loader = modload.NewDisabledState() } if len(args) > 0 && strings.Index(args[0], "@") >= 0 { // Version query: force no root diff --git a/src/cmd/go/internal/modload/init.go b/src/cmd/go/internal/modload/init.go index e71e467d9f..515b40a00d 100644 --- a/src/cmd/go/internal/modload/init.go +++ b/src/cmd/go/internal/modload/init.go @@ -467,7 +467,7 @@ func NewState() *State { return s } -func DisabledState() *State { +func NewDisabledState() *State { fips140.Init() return &State{initialized: true, modulesEnabled: false} } |