Skip to content

Commit

Permalink
cmd/go/internal/modload: address issues missed in CL 244774
Browse files Browse the repository at this point in the history
For golang#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]>
  • Loading branch information
Bryan C. Mills committed Aug 27, 2020
1 parent 234e37b commit a98fe26
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/cmd/go/internal/modload/modfile.go
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ type retraction struct {

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

// In theory we should only allow mpath to be unequal to mod.Path here if the
// In theory we should only allow mpath to be unequal to m.Path here if the
// version that we fetched lacks an explicit go.mod file: if the go.mod file
// is explicit, then it should match exactly (to ensure that imports of other
// packages within the module are interpreted correctly). Unfortunately, we
Expand Down
2 changes: 0 additions & 2 deletions src/cmd/go/internal/modload/mvs.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import (

"cmd/go/internal/modfetch"
"cmd/go/internal/mvs"
"cmd/go/internal/par"

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

// Reqs returns the current module requirement graph.
Expand Down

0 comments on commit a98fe26

Please sign in to comment.