Skip to content

Commit af9009a

Browse files
author
Bryan C. Mills
committed
cmd/go/internal/modload: remove go117LazyTODO
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>
1 parent 9da7cca commit af9009a

File tree

2 files changed

+4
-13
lines changed

2 files changed

+4
-13
lines changed

src/cmd/go/internal/modload/edit.go

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -253,12 +253,10 @@ func raiseLimitsForUpgrades(ctx context.Context, maxVersion map[string]string, d
253253
// common versions among multiple upgrades.
254254
upgradeGraph, err := readModGraph(ctx, eager, eagerUpgrades)
255255
if err != nil {
256-
if go117LazyTODO {
257-
// Compute the requirement path from a module path in tryUpgrade to the
258-
// error, and the requirement path (if any) from rs.rootModules to the
259-
// tryUpgrade module path. Return a *mvs.BuildListError showing the
260-
// concatenation of the paths (with an upgrade in the middle).
261-
}
256+
// Compute the requirement path from a module path in tryUpgrade to the
257+
// error, and the requirement path (if any) from rs.rootModules to the
258+
// tryUpgrade module path. Return a *mvs.BuildListError showing the
259+
// concatenation of the paths (with an upgrade in the middle).
262260
return err
263261
}
264262

src/cmd/go/internal/modload/modfile.go

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,6 @@ const (
4444
separateIndirectVersionV = "v1.17"
4545
)
4646

47-
const (
48-
// go1117LazyTODO is a constant that exists only until lazy loading is
49-
// implemented. Its use indicates a condition that will need to change if the
50-
// main module is lazy.
51-
go117LazyTODO = false
52-
)
53-
5447
// modFileGoVersion returns the (non-empty) Go version at which the requirements
5548
// in modFile are interpreted, or the latest Go version if modFile is nil.
5649
func modFileGoVersion(modFile *modfile.File) string {

0 commit comments

Comments
 (0)