From 0cadf40f4c3613c0170120f4b902cb153338db15 Mon Sep 17 00:00:00 2001 From: Jay Conrod Date: Tue, 16 Jul 2019 12:51:34 -0400 Subject: [PATCH] cmd/go: tweak wording of module path mismatch error message Changes "was loaded as" to "was required as". This is slightly more precise, since it hints at a requirement edge in the module version graph. Updates #28489 Change-Id: I636268c33f1ea9858c214fe275f271538186ed6d Reviewed-on: https://go-review.googlesource.com/c/go/+/186377 Run-TryBot: Jay Conrod TryBot-Result: Gobot Gobot Reviewed-by: Bryan C. Mills --- src/cmd/go/internal/modload/load.go | 2 +- src/cmd/go/testdata/script/mod_load_badchain.txt | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/cmd/go/internal/modload/load.go b/src/cmd/go/internal/modload/load.go index c6a7c419fb..9a5d4f231c 100644 --- a/src/cmd/go/internal/modload/load.go +++ b/src/cmd/go/internal/modload/load.go @@ -1138,7 +1138,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 loaded as: %s`, mod.Path, mpath)) + but was required as: %s`, mod.Path, mpath)) } if f.Go != nil { r.versions.LoadOrStore(mod, f.Go.Version) diff --git a/src/cmd/go/testdata/script/mod_load_badchain.txt b/src/cmd/go/testdata/script/mod_load_badchain.txt index 1e0b472468..559f411593 100644 --- a/src/cmd/go/testdata/script/mod_load_badchain.txt +++ b/src/cmd/go/testdata/script/mod_load_badchain.txt @@ -59,27 +59,27 @@ func Test(t *testing.T) {} 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 loaded as: example.com/badchain/wrong + but was required as: example.com/badchain/wrong -- 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 loaded as: example.com/badchain/wrong + but was required as: example.com/badchain/wrong -- 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 loaded as: example.com/badchain/wrong + but was required as: example.com/badchain/wrong -- 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 loaded as: example.com/badchain/wrong + but was required as: example.com/badchain/wrong -- 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 loaded as: example.com/badchain/wrong + but was required as: example.com/badchain/wrong -- 2.50.0