From: Bryan C. Mills Date: Thu, 19 Nov 2020 18:58:52 +0000 (-0500) Subject: cmd/go/internal/modload: eliminate LoadedModules X-Git-Tag: go1.16beta1~187 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=cb3f84ad25abaea28dad905ceddd81a5a334e806;p=gostls13.git cmd/go/internal/modload: eliminate LoadedModules As of CL 271646, all external callers have been eliminated. Replace the remaining internal caller with a direct reference to the buildList variable and remove the exported function to prevent backsliding. For #36460 Change-Id: Iea82df1e3e604ada602dda3e830c06d441eee2a7 Reviewed-on: https://go-review.googlesource.com/c/go/+/271647 Trust: Bryan C. Mills Run-TryBot: Bryan C. Mills Reviewed-by: Jay Conrod --- diff --git a/src/cmd/go/internal/modload/build.go b/src/cmd/go/internal/modload/build.go index b9e344045d..8ad5f834de 100644 --- a/src/cmd/go/internal/modload/build.go +++ b/src/cmd/go/internal/modload/build.go @@ -75,7 +75,7 @@ func ModuleInfo(ctx context.Context, path string) *modinfo.ModulePublic { return moduleInfo(ctx, m, fromBuildList, listRetracted) } - for _, m := range LoadedModules() { + for _, m := range buildList { if m.Path == path { fromBuildList := true return moduleInfo(ctx, m, fromBuildList, listRetracted) diff --git a/src/cmd/go/internal/modload/buildlist.go b/src/cmd/go/internal/modload/buildlist.go index 5b9984a492..bec22dba1f 100644 --- a/src/cmd/go/internal/modload/buildlist.go +++ b/src/cmd/go/internal/modload/buildlist.go @@ -49,15 +49,6 @@ func LoadAllModules(ctx context.Context) []module.Version { return capVersionSlice(buildList) } -// LoadedModules returns the list of module requirements loaded or set by a -// previous call (typically LoadAllModules or LoadPackages), starting with the -// Target module and in a deterministic (stable) order. -// -// The caller must not modify the returned list, but may append to it. -func LoadedModules() []module.Version { - return capVersionSlice(buildList) -} - // Selected returns the selected version of the module with the given path, or // the empty string if the given module has no selected version // (either because it is not required or because it is the Target module).