Skip to content

Commit a98fe26

Browse files
author
Bryan C. Mills
committed
cmd/go/internal/modload: address issues missed in CL 244774
For #36460 Change-Id: I5e9a42d64e36679b881e96145833e66cf77b98a5 Reviewed-on: https://go-review.googlesource.com/c/go/+/250338 Run-TryBot: Bryan C. Mills <[email protected]> TryBot-Result: Gobot Gobot <[email protected]> Reviewed-by: Michael Matloob <[email protected]>
1 parent 234e37b commit a98fe26

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ type retraction struct {
345345

346346
// goModSummary returns a summary of the go.mod file for module m,
347347
// taking into account any replacements for m, exclusions of its dependencies,
348-
// and or vendoring.
348+
// and/or vendoring.
349349
//
350350
// goModSummary cannot be used on the Target module, as its requirements
351351
// may change.
@@ -405,7 +405,7 @@ func goModSummary(m module.Version) (*modFileSummary, error) {
405405
return cached{nil, module.VersionError(actual, errors.New("parsing go.mod: missing module line"))}
406406
}
407407

408-
// In theory we should only allow mpath to be unequal to mod.Path here if the
408+
// In theory we should only allow mpath to be unequal to m.Path here if the
409409
// version that we fetched lacks an explicit go.mod file: if the go.mod file
410410
// is explicit, then it should match exactly (to ensure that imports of other
411411
// packages within the module are interpreted correctly). Unfortunately, we

src/cmd/go/internal/modload/mvs.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import (
1414

1515
"cmd/go/internal/modfetch"
1616
"cmd/go/internal/mvs"
17-
"cmd/go/internal/par"
1817

1918
"golang.org/x/mod/module"
2019
"golang.org/x/mod/semver"
@@ -24,7 +23,6 @@ import (
2423
// with any exclusions or replacements applied internally.
2524
type mvsReqs struct {
2625
buildList []module.Version
27-
cache par.Cache // module.Version → Required method results
2826
}
2927

3028
// Reqs returns the current module requirement graph.

0 commit comments

Comments
 (0)