qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-17 10:34:49 -07:00
Code Releases Activity

cmd/go/internal/modload: remove go117LazyTODO

Browse Source 
Replace the last remaining use with a reference to #48024.

Change-Id: I699711b4e42abe9c6d3512c28d2ee81a84e3263a
Reviewed-on: https://go-review.googlesource.com/c/go/+/345392
Trust: Bryan C. Mills <bcmills@google.com>
Run-TryBot: Bryan C. Mills <bcmills@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Jay Conrod <jayconrod@google.com>
This commit is contained in:
Bryan C. Mills 2021-08-27 15:08:02 -04:00
parent 9da7ccab58
commit af9009a989
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/cmd/go/internal/modload/edit.go
View File

@ -253,12 +253,10 @@ func raiseLimitsForUpgrades(ctx context.Context, maxVersion map[string]string, d
// common versions among multiple upgrades. // common versions among multiple upgrades.
upgradeGraph, err := readModGraph(ctx, eager, eagerUpgrades) upgradeGraph, err := readModGraph(ctx, eager, eagerUpgrades)
if err != nil { if err != nil {
if go117LazyTODO { // Compute the requirement path from a module path in tryUpgrade to the
// Compute the requirement path from a module path in tryUpgrade to the // error, and the requirement path (if any) from rs.rootModules to the
// error, and the requirement path (if any) from rs.rootModules to the // tryUpgrade module path. Return a *mvs.BuildListError showing the
// tryUpgrade module path. Return a *mvs.BuildListError showing the // concatenation of the paths (with an upgrade in the middle).
// concatenation of the paths (with an upgrade in the middle).
}
return err return err
} }

7
src/cmd/go/internal/modload/modfile.go
View File

@ -44,13 +44,6 @@ const (
separateIndirectVersionV = "v1.17" separateIndirectVersionV = "v1.17"
) )
const (
// go1117LazyTODO is a constant that exists only until lazy loading is
// implemented. Its use indicates a condition that will need to change if the
// main module is lazy.
go117LazyTODO = false
)
// modFileGoVersion returns the (non-empty) Go version at which the requirements // modFileGoVersion returns the (non-empty) Go version at which the requirements
// in modFile are interpreted, or the latest Go version if modFile is nil. // in modFile are interpreted, or the latest Go version if modFile is nil.
func modFileGoVersion(modFile *modfile.File) string { func modFileGoVersion(modFile *modfile.File) string {