From ba0dd3b328d16e0e66a6fcb8be5fda266d965ea2 Mon Sep 17 00:00:00 2001 From: Jes Cok Date: Mon, 6 Nov 2023 14:27:32 +0000 Subject: [PATCH] cmd/go/internal/modload: avoid calling strings.HasPrefix twice in *MainModuleSet.DirImportPath Since TrimPrefix uses HasPrefix internally. Change-Id: Ifadb99dd9192578056636adacaccc9d88a1c1f32 GitHub-Last-Rev: 74bcfff3fb5eaee281796ccb5bc84c6941d44615 GitHub-Pull-Request: golang/go#63893 Reviewed-on: https://go-review.googlesource.com/c/go/+/539096 Run-TryBot: Jes Cok Auto-Submit: Bryan Mills Reviewed-by: Heschi Kreinick TryBot-Result: Gopher Robot Reviewed-by: Bryan Mills --- src/cmd/go/internal/modload/load.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmd/go/internal/modload/load.go b/src/cmd/go/internal/modload/load.go index 9b4cb19ebf..51eb141d4b 100644 --- a/src/cmd/go/internal/modload/load.go +++ b/src/cmd/go/internal/modload/load.go @@ -777,7 +777,7 @@ func (mms *MainModuleSet) DirImportPath(ctx context.Context, dir string) (path s longestPrefixVersion = v suffix := filepath.ToSlash(str.TrimFilePathPrefix(dir, modRoot)) if strings.HasPrefix(suffix, "vendor/") { - longestPrefixPath = strings.TrimPrefix(suffix, "vendor/") + longestPrefixPath = suffix[len("vendor/"):] continue } longestPrefixPath = pathpkg.Join(mms.PathPrefix(v), suffix) -- 2.44.0