Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2026-02-06 09:50:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

cmd/go: inject state parameter into fmtcmd.runFmt

Browse source 
This command modifies the call tree starting at `fmtcmd.runFmt` to
inject a `State` parameter to every function that is currently using
the global `modload.LoaderState` variable.  By explicilty passing a
`State` parameter, we can begin to eliminate the usage of the global
`modload.LoaderState`.

This commit is part of the overall effort to eliminate global
modloader state.

[git-generate]
cd src/cmd/go/internal/fmtcmd
rf '
  inject modload.LoaderState runFmt
  add fmt.go var moduleLoaderState *modload.State
  ex {
    import "cmd/go/internal/modload";
    modload.LoaderState -> moduleLoaderState
  }
  add runFmt://+0 moduleLoaderState := modload.NewState()
  rm fmt.go:/var moduleLoaderState \*modload.State/
'
cd ..
./rf-cleanup.zsh

Change-Id: Ib6692aba37a2cbc5b52d3bb705ec2b442afd26eb
Reviewed-on: https://go-review.googlesource.com/c/go/+/709989
Reviewed-by: Michael Matloob <matloob@golang.org>
Reviewed-by: Michael Matloob <matloob@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
This commit is contained in:
Ian Alexander 2025-10-03 15:04:30 -04:00
parent f7eaea02fd
commit 29a81624f7
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/cmd/go/internal/fmtcmd/fmt.go
View file

@ -50,6 +50,7 @@ See also: go fix, go vet.
}
func runFmt(ctx context.Context, cmd *base.Command, args []string) {
moduleLoaderState := modload.NewState()
printed := false
gofmt := gofmtPath()
@ -59,8 +60,8 @@ func runFmt(ctx context.Context, cmd *base.Command, args []string) {
baseGofmtArgs := len(gofmtArgs)
baseGofmtArgLen := gofmtArgLen
for _, pkg := range load.PackagesAndErrors(modload.LoaderState, ctx, load.PackageOpts{}, args) {
if modload.Enabled(modload.LoaderState) && pkg.Module != nil && !pkg.Module.Main {
for _, pkg := range load.PackagesAndErrors(moduleLoaderState, ctx, load.PackageOpts{}, args) {
if modload.Enabled(moduleLoaderState) && pkg.Module != nil && !pkg.Module.Main {
if !printed {
fmt.Fprintf(os.Stderr, "go: not formatting packages in dependency modules\n")
printed = true