diff options
| author | Bryan C. Mills <bcmills@google.com> | 2020-08-24 21:34:33 -0400 |
|---|---|---|
| committer | Bryan C. Mills <bcmills@google.com> | 2020-08-27 19:38:43 +0000 |
| commit | a98fe2632cf144d6ed41daf7255aa912f0e430db (patch) | |
| tree | a93b90aa4a90a0f7bd6cceaa29c35179f1d5dee3 /src/cmd/go/internal/modload/modfile.go | |
| parent | 234e37bcda2b5efdd685ad11d1bb3d336415648e (diff) | |
| download | go-a98fe2632cf144d6ed41daf7255aa912f0e430db.tar.gz go-a98fe2632cf144d6ed41daf7255aa912f0e430db.zip | |
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 <bcmills@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Michael Matloob <matloob@golang.org>
Diffstat (limited to 'src/cmd/go/internal/modload/modfile.go')
| -rw-r--r-- | src/cmd/go/internal/modload/modfile.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cmd/go/internal/modload/modfile.go b/src/cmd/go/internal/modload/modfile.go index 0b135c5fb5..a45c4a63be 100644 --- a/src/cmd/go/internal/modload/modfile.go +++ b/src/cmd/go/internal/modload/modfile.go @@ -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. @@ -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 |