src/cmd/go/internal/modload/load.go | 2 +- src/cmd/go/testdata/mod/example.com_badchain_c_v1.1.0.txt | 2 +- src/cmd/go/testdata/script/mod_load_badchain.txt | 20 ++++++++++---------- diff --git a/src/cmd/go/internal/modload/load.go b/src/cmd/go/internal/modload/load.go index 52b371e5a9790779106f2d3917cbfc4c9f8212f5..b50a084166d446c54a4a9fa34970ea3bc21493d9 100644 --- a/src/cmd/go/internal/modload/load.go +++ b/src/cmd/go/internal/modload/load.go @@ -1140,7 +1140,7 @@ } 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) diff --git a/src/cmd/go/testdata/mod/example.com_badchain_c_v1.1.0.txt b/src/cmd/go/testdata/mod/example.com_badchain_c_v1.1.0.txt index da19ebd9ec9060cb16d1062699232979b7dd9ed1..36bc2c67266e0c7906e9fd4e7ba5964b3b1a328b 100644 --- a/src/cmd/go/testdata/mod/example.com_badchain_c_v1.1.0.txt +++ b/src/cmd/go/testdata/mod/example.com_badchain_c_v1.1.0.txt @@ -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 -- diff --git a/src/cmd/go/testdata/script/mod_load_badchain.txt b/src/cmd/go/testdata/script/mod_load_badchain.txt index 559f4115939db603784cc9b224e1760aa8e5143c..b97a2e6eaba2c5bad0202919d5948c9b8b9a5256 100644 --- a/src/cmd/go/testdata/script/mod_load_badchain.txt +++ b/src/cmd/go/testdata/script/mod_load_badchain.txt @@ -58,28 +58,28 @@ func Test(t *testing.T) {} -- update-main-expected -- go get: example.com/badchain/c@v1.0.0 updating to example.com/badchain/c@v1.1.0: 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/a@v1.1.0 requires example.com/badchain/b@v1.1.0 requires example.com/badchain/c@v1.1.0: 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/a@v1.1.0 requires example.com/badchain/b@v1.1.0 requires example.com/badchain/c@v1.1.0: 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/c@v1.1.0: 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/c@v1.1.0: 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