From f619b4a00d6a7ce2fbb84729cdfe764697cb2171 Mon Sep 17 00:00:00 2001 From: Ian Alexander Date: Fri, 24 Oct 2025 16:41:38 -0400 Subject: [PATCH] cmd/go: reorder parameters so that context is first This change simply reorders parameters so that the context.Context is the first, as per standard practice. This commit is part of the overall effort to eliminate global modloader state. Change-Id: I22d366fb2d2457f44d668409da3fe76fb87180cc Reviewed-on: https://go-review.googlesource.com/c/go/+/714780 Reviewed-by: Michael Matloob LUCI-TryBot-Result: Go LUCI Reviewed-by: Michael Matloob --- src/cmd/go/internal/workcmd/init.go | 2 +- src/cmd/go/internal/workcmd/use.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cmd/go/internal/workcmd/init.go b/src/cmd/go/internal/workcmd/init.go index 0a6db1133fd..9ba9e4dec02 100644 --- a/src/cmd/go/internal/workcmd/init.go +++ b/src/cmd/go/internal/workcmd/init.go @@ -62,6 +62,6 @@ func runInit(ctx context.Context, cmd *base.Command, args []string) { wf := new(modfile.WorkFile) wf.Syntax = new(modfile.FileSyntax) wf.AddGoStmt(goV) - workUse(moduleLoaderState, ctx, gowork, wf, args) + workUse(ctx, moduleLoaderState, gowork, wf, args) modload.WriteWorkFile(gowork, wf) } diff --git a/src/cmd/go/internal/workcmd/use.go b/src/cmd/go/internal/workcmd/use.go index 425be01f774..eae9688b524 100644 --- a/src/cmd/go/internal/workcmd/use.go +++ b/src/cmd/go/internal/workcmd/use.go @@ -72,11 +72,11 @@ func runUse(ctx context.Context, cmd *base.Command, args []string) { if err != nil { base.Fatal(err) } - workUse(moduleLoaderState, ctx, gowork, wf, args) + workUse(ctx, moduleLoaderState, gowork, wf, args) modload.WriteWorkFile(gowork, wf) } -func workUse(loaderstate *modload.State, ctx context.Context, gowork string, wf *modfile.WorkFile, args []string) { +func workUse(ctx context.Context, s *modload.State, gowork string, wf *modfile.WorkFile, args []string) { workDir := filepath.Dir(gowork) // absolute, since gowork itself is absolute haveDirs := make(map[string][]string) // absolute → original(s) @@ -95,7 +95,7 @@ func workUse(loaderstate *modload.State, ctx context.Context, gowork string, wf // all entries for the absolute path should be removed. keepDirs := make(map[string]string) - sw := toolchain.NewSwitcher(loaderstate) + sw := toolchain.NewSwitcher(s) // lookDir updates the entry in keepDirs for the directory dir, // which is either absolute or relative to the current working directory