mirror
/
go
mirror of https://github.com/golang/go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cmd/go: clean up handling of go mod tidy -go=v during modload 

Slight cleanup of the special case for "mod tidy" during modload
of a module with no go version. Now it's clearer what is special.

For #57001.

Change-Id: I4a3ad0a948ccb5c62365f2a7f7f7de5582cc57c9
Reviewed-on: https://go-review.googlesource.com/c/go/+/499535
Reviewed-by: Bryan Mills <bcmills@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Auto-Submit: Russ Cox <rsc@golang.org>
Run-TryBot: Russ Cox <rsc@golang.org>
This commit is contained in:
Russ Cox 2023-05-31 09:38:29 -04:00 committed by Gopher Robot
parent 97a2ed74ad
commit 51114a3fa5
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/cmd/go/internal/modload/init.go
View File

@ -849,25 +849,24 @@ func loadModFile(ctx context.Context, opts *PackageOpts) *Requirements {
// cfg.CmdName directly here.
if cfg.BuildMod == "mod" && cfg.CmdName != "mod graph" && cfg.CmdName != "mod why" {
// go line is missing from go.mod; add one there and add to derived requirements.
addGoStmt(MainModules.ModFile(mainModule), mainModule, gover.Local())
if cfg.CmdName != "mod tidy" {
// We want to add the "go" line to the module load in general,
// if we do it in "mod tidy", then go mod tidy -go=older for some older version
// when we are in a module with no go line will see gover.Local() in the
// requirement graph and then report that -go=older is invalid.
// go test -run=Script/mod_tidy_version will fail without the tidy exclusion.
rs = overrideRoots(ctx, rs, []module.Version{{Path: "go", Version: gover.Local()}})
v := gover.Local()
if opts != nil && opts.TidyGo {
v = opts.GoVersion
}
addGoStmt(MainModules.ModFile(mainModule), mainModule, v)
rs = overrideRoots(ctx, rs, []module.Version{{Path: "go", Version: v}})
// We need to add a 'go' version to the go.mod file, but we must assume
// that its existing contents match something between Go 1.11 and 1.16.
// Go 1.11 through 1.16 do not support graph pruning, but the latest Go
// version uses a pruned module graph — so we need to convert the
// requirements to support pruning.
var err error
rs, err = convertPruning(ctx, rs, pruned)
if err != nil {
base.Fatalf("go: %v", err)
if gover.Compare(v, ExplicitIndirectVersion) >= 0 {
var err error
rs, err = convertPruning(ctx, rs, pruned)
if err != nil {
base.Fatalf("go: %v", err)
}
}
} else {
rawGoVersion.Store(mainModule, modFileGoVersion(MainModules.ModFile(mainModule)))