Skip to content

Commit

Permalink
cmd/go/internal/modload: fix swapped paths in error message
Browse files Browse the repository at this point in the history
Updates #33879

Change-Id: Ifc91490b1cb791fdf5ffe69ef81c0ec0e6cbecc3
Reviewed-on: https://go-review.googlesource.com/c/go/+/191997
Run-TryBot: Bryan C. Mills <[email protected]>
Reviewed-by: Alexander Rakoczy <[email protected]>
  • Loading branch information
Bryan C. Mills committed Aug 27, 2019
1 parent c302785 commit 8f5353f
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion src/cmd/go/internal/modload/load.go
Original file line number Diff line number Diff line change
Expand Up @@ -1140,7 +1140,7 @@ func (r *mvsReqs) required(mod module.Version) ([]module.Version, error) {
if mpath := f.Module.Mod.Path; mpath != origPath && mpath != mod.Path {
return nil, module.VersionError(mod, fmt.Errorf(`parsing go.mod:
module declares its path as: %s
but was required as: %s`, mod.Path, mpath))
but was required as: %s`, mpath, mod.Path))
}
if f.Go != nil {
r.versions.LoadOrStore(mod, f.Go.Version)
Expand Down
2 changes: 1 addition & 1 deletion src/cmd/go/testdata/mod/example.com_badchain_c_v1.1.0.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
example.com/badchain/c v1.1.0

-- .mod --
module example.com/badchain/wrong
module badchain.example.com/c
-- .info --
{"Version":"v1.1.0"}
-- c.go --
Expand Down
20 changes: 10 additions & 10 deletions src/cmd/go/testdata/script/mod_load_badchain.txt
Original file line number Diff line number Diff line change
Expand Up @@ -58,28 +58,28 @@ func Test(t *testing.T) {}
-- update-main-expected --
go get: example.com/badchain/[email protected] updating to
example.com/badchain/[email protected]: parsing go.mod:
module declares its path as: example.com/badchain/c
but was required as: example.com/badchain/wrong
module declares its path as: badchain.example.com/c
but was required as: example.com/badchain/c
-- update-a-expected --
go get: example.com/badchain/[email protected] requires
example.com/badchain/[email protected] requires
example.com/badchain/[email protected]: parsing go.mod:
module declares its path as: example.com/badchain/c
but was required as: example.com/badchain/wrong
module declares its path as: badchain.example.com/c
but was required as: example.com/badchain/c
-- list-expected --
go: example.com/badchain/[email protected] requires
example.com/badchain/[email protected] requires
example.com/badchain/[email protected]: parsing go.mod:
module declares its path as: example.com/badchain/c
but was required as: example.com/badchain/wrong
module declares its path as: badchain.example.com/c
but was required as: example.com/badchain/c
-- list-missing-expected --
go: m/use imports
example.com/badchain/c: example.com/badchain/[email protected]: parsing go.mod:
module declares its path as: example.com/badchain/c
but was required as: example.com/badchain/wrong
module declares its path as: badchain.example.com/c
but was required as: example.com/badchain/c
-- list-missing-test-expected --
go: m/testuse tested by
m/testuse.test imports
example.com/badchain/c: example.com/badchain/[email protected]: parsing go.mod:
module declares its path as: example.com/badchain/c
but was required as: example.com/badchain/wrong
module declares its path as: badchain.example.com/c
but was required as: example.com/badchain/c

0 comments on commit 8f5353f

Please sign in to comment.